diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index 1bbbe105b5b1..10b2f998525d 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -174,7 +174,7 @@
     All should have PrivateAssets="All" set so they don't become package dependencies
   -->
   <ItemGroup>
-    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20230906.1" PrivateAssets="All" />
+    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-alpha.20230907.3" PrivateAssets="All" />
     <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20230822.1" PrivateAssets="All" />
     <PackageReference Update="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
     <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1" PrivateAssets="All" />
diff --git a/eng/emitter-package.json b/eng/emitter-package.json
index abe6a58e8878..130ec367d754 100644
--- a/eng/emitter-package.json
+++ b/eng/emitter-package.json
@@ -1,6 +1,6 @@
 {
     "main": "dist/src/index.js",
     "dependencies": {
-      "@azure-tools/typespec-csharp": "0.2.0-beta.20230906.1"
+      "@azure-tools/typespec-csharp": "0.2.0-alpha.20230907.3"
     }
 }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ApplicationData.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ApplicationData.xml
index c6c98a55653f..1842aba0fbce 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ApplicationData.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ApplicationData.xml
@@ -2,13 +2,25 @@
 <doc>
   <members>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -23,17 +35,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -48,17 +71,26 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetApplicationDataAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetApplicationDataAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetApplicationDataAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetApplicationDataAsync("<partyId>", "<applicationDataId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetApplicationDataAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetApplicationDataAsync("<partyId>", "<applicationDataId>", new RequestContext());
+Response response = await client.GetApplicationDataAsync("<partyId>", "<applicationDataId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
@@ -89,18 +121,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetApplicationData(string,string,RequestContext)">
-<example>
-This sample shows how to call GetApplicationData with required parameters and parse the result.
+      <example>
+This sample shows how to call GetApplicationData and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetApplicationData("<partyId>", "<applicationDataId>", new RequestContext());
+Response response = client.GetApplicationData("<partyId>", "<applicationDataId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetApplicationData with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetApplicationData("<partyId>", "<applicationDataId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
@@ -131,70 +172,64 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<applicationDataId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<applicationDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
-
-var data = new {
-    applicationProductDetails = new[] {
-        new {
-            productName = "<productName>",
-            isCarrier = true,
-            avgMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-        }
-    },
-    avgMaterial = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    totalMaterial = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    area = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    associatedBoundaryId = "<associatedBoundaryId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<applicationDataId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["applicationProductDetails"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["productName"] = "<productName>",
+["isCarrier"] = true,
+["avgMaterial"] = new Dictionary<string, object>()
+{
+["unit"] = "<unit>",
+["value"] = 123.45,
+},
+["totalMaterial"] = null
+,
+}
+},
+    ["avgMaterial"] = null
+,
+    ["totalMaterial"] = null
+,
+    ["area"] = null
+,
+    ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["associatedBoundaryId"] = "<associatedBoundaryId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<applicationDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
@@ -225,70 +260,64 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = client.CreateOrUpdate("<partyId>", "<applicationDataId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<applicationDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
-
-var data = new {
-    applicationProductDetails = new[] {
-        new {
-            productName = "<productName>",
-            isCarrier = true,
-            avgMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-        }
-    },
-    avgMaterial = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    totalMaterial = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    area = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    associatedBoundaryId = "<associatedBoundaryId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<applicationDataId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["applicationProductDetails"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["productName"] = "<productName>",
+["isCarrier"] = true,
+["avgMaterial"] = new Dictionary<string, object>()
+{
+["unit"] = "<unit>",
+["value"] = 123.45,
+},
+["totalMaterial"] = null
+,
+}
+},
+    ["avgMaterial"] = null
+,
+    ["totalMaterial"] = null
+,
+    ["area"] = null
+,
+    ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["associatedBoundaryId"] = "<associatedBoundaryId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = client.CreateOrUpdate("<partyId>", "<applicationDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
@@ -319,216 +348,354 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<applicationDataId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<applicationDataId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<applicationDataId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<applicationDataId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetAllApplicationDataAsync(double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllApplicationDataAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllApplicationDataAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetAllApplicationDataAsync(3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<applicationIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetAllApplicationDataAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllApplicationDataAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetAllApplicationDataAsync(123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<applicationIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllApplicationData(double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllApplicationData with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllApplicationData and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetAllApplicationData(3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<applicationIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetAllApplicationData(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllApplicationData with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetAllApplicationData(123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<applicationIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllApplicationDataByPartyIdAsync(string,double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllApplicationDataByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllApplicationDataByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetAllApplicationDataByPartyIdAsync("<partyId>", 3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetAllApplicationDataByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllApplicationDataByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetAllApplicationDataByPartyIdAsync("<partyId>", 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllApplicationDataByPartyId(string,double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllApplicationDataByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllApplicationDataByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetAllApplicationDataByPartyId("<partyId>", 3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetAllApplicationDataByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllApplicationDataByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetAllApplicationDataByPartyId("<partyId>", 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<applicationDataId>", new RequestContext());
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<applicationDataId>", null);
+BinaryData responseData = operation.Value;
+
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<applicationDataId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -542,19 +709,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<applicationDataId>", null);
+BinaryData responseData = operation.Value;
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<applicationDataId>", new RequestContext());
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<applicationDataId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -568,8 +747,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Attachments.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Attachments.xml
index a53dbfb6ad3a..6869bbc34ca7 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Attachments.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Attachments.xml
@@ -2,13 +2,23 @@
 <doc>
   <members>
     <member name="GetAttachmentAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetAttachmentAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAttachmentAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetAttachmentAsync("<partyId>", "<attachmentId>", new RequestContext());
+Response response = await client.GetAttachmentAsync("<partyId>", "<attachmentId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetAttachmentAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetAttachmentAsync("<partyId>", "<attachmentId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -25,17 +35,26 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAttachment(string,string,RequestContext)">
-<example>
-This sample shows how to call GetAttachment with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAttachment and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetAttachment("<partyId>", "<attachmentId>", new RequestContext());
+Response response = client.GetAttachment("<partyId>", "<attachmentId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetAttachment with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetAttachment("<partyId>", "<attachmentId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -52,19 +71,28 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = null;
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<attachmentId>", content);
 
-var data = File.OpenRead("<filePath>");
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<attachmentId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<attachmentId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -81,19 +109,28 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-var data = File.OpenRead("<filePath>");
+RequestContent content = null;
+Response response = client.CreateOrUpdate("<partyId>", "<attachmentId>", content);
 
-Response response = client.CreateOrUpdate("<partyId>", "<attachmentId>", RequestContent.Create(data));
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = client.CreateOrUpdate("<partyId>", "<attachmentId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -110,124 +147,219 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<attachmentId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<attachmentId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<attachmentId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<attachmentId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DownloadAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DownloadAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DownloadAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.DownloadAsync("<partyId>", "<attachmentId>", new RequestContext());
+Response response = await client.DownloadAsync("<partyId>", "<attachmentId>", null);
 if (response.ContentStream != null)
 {
-    using(Stream outFileStream = File.OpenWrite("<filePath>"))
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
     {
         response.ContentStream.CopyTo(outFileStream);
     }
 }
 ]]></code>
-</example>
+This sample shows how to call DownloadAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DownloadAsync("<partyId>", "<attachmentId>", null);
+if (response.ContentStream != null)
+{
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
+    {
+        response.ContentStream.CopyTo(outFileStream);
+    }
+}
+]]></code></example>
     </member>
     <member name="Download(string,string,RequestContext)">
-<example>
-This sample shows how to call Download with required parameters and parse the result.
+      <example>
+This sample shows how to call Download and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.Download("<partyId>", "<attachmentId>", new RequestContext());
+Response response = client.Download("<partyId>", "<attachmentId>", null);
 if (response.ContentStream != null)
 {
-    using(Stream outFileStream = File.OpenWrite("<filePath>"))
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
     {
         response.ContentStream.CopyTo(outFileStream);
     }
 }
 ]]></code>
-</example>
+This sample shows how to call Download with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Download("<partyId>", "<attachmentId>", null);
+if (response.ContentStream != null)
+{
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
+    {
+        response.ContentStream.CopyTo(outFileStream);
+    }
+}
+]]></code></example>
     </member>
     <member name="GetAttachmentsByPartyIdAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAttachmentsByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAttachmentsByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetAttachmentsByPartyIdAsync("<partyId>", new String[]{"<resourceIds>"}, new String[]{"<resourceTypes>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetAttachmentsByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("resourceId").ToString());
-    Console.WriteLine(result.GetProperty("resourceType").ToString());
-    Console.WriteLine(result.GetProperty("originalFileName").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAttachmentsByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetAttachmentsByPartyIdAsync("<partyId>", new List<string>()
+{
+"<resourceIds>"
+}, new List<string>()
+{
+"<resourceTypes>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceType").ToString());
+    Console.WriteLine(result[0].GetProperty("originalFileName").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAttachmentsByPartyId(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAttachmentsByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAttachmentsByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetAttachmentsByPartyId("<partyId>", new String[]{"<resourceIds>"}, new String[]{"<resourceTypes>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetAttachmentsByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("resourceId").ToString());
-    Console.WriteLine(result.GetProperty("resourceType").ToString());
-    Console.WriteLine(result.GetProperty("originalFileName").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAttachmentsByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetAttachmentsByPartyId("<partyId>", new List<string>()
+{
+"<resourceIds>"
+}, new List<string>()
+{
+"<resourceTypes>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceType").ToString());
+    Console.WriteLine(result[0].GetProperty("originalFileName").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Boundaries.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Boundaries.xml
index 8c107b33862d..d7be79092845 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Boundaries.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Boundaries.xml
@@ -2,13 +2,25 @@
 <doc>
   <members>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -23,17 +35,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -48,82 +71,67 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<boundaryId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<boundaryId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
-
-var data = new {
-    geometry = new {
-        coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-        type = "MultiPolygon",
-    },
-    type = "<type>",
-    centroid = new {
-        coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-        type = "MultiPolygon",
-    },
-    bbox = new {
-        coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-        type = "MultiPolygon",
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["geometry"] = new Dictionary<string, object>()
+    {
+        ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+        ["type"] = "MultiPolygon",
     },
-    parentId = "<parentId>",
-    area = new {
-        unit = "<unit>",
-        value = 123.45d,
+    ["type"] = "<type>",
+    ["centroid"] = null
+,
+    ["bbox"] = null
+,
+    ["parentId"] = "<parentId>",
+    ["area"] = new Dictionary<string, object>()
+    {
+        ["unit"] = "<unit>",
+        ["value"] = 123.45,
     },
-    parentType = "Field",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["parentType"] = "Field",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<boundaryId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<boundaryId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("geometry").GetProperty("type").ToString());
@@ -146,83 +154,68 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = client.CreateOrUpdate("<partyId>", "<boundaryId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<boundaryId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
-
-var data = new {
-    geometry = new {
-        coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-        type = "MultiPolygon",
-    },
-    type = "<type>",
-    centroid = new {
-        coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-        type = "MultiPolygon",
-    },
-    bbox = new {
-        coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-        type = "MultiPolygon",
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["geometry"] = new Dictionary<string, object>()
+    {
+        ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+        ["type"] = "MultiPolygon",
     },
-    parentId = "<parentId>",
-    area = new {
-        unit = "<unit>",
-        value = 123.45d,
+    ["type"] = "<type>",
+    ["centroid"] = null
+,
+    ["bbox"] = null
+,
+    ["parentId"] = "<parentId>",
+    ["area"] = new Dictionary<string, object>()
+    {
+        ["unit"] = "<unit>",
+        ["value"] = 123.45,
     },
-    parentType = "Field",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["parentType"] = "Field",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.CreateOrUpdate("<partyId>", "<boundaryId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<partyId>", "<boundaryId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("geometry").GetProperty("type").ToString());
@@ -245,18 +238,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetBoundaryAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetBoundaryAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBoundaryAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetBoundaryAsync("<partyId>", "<boundaryId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetBoundaryAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetBoundaryAsync("<partyId>", "<boundaryId>", new RequestContext());
+Response response = await client.GetBoundaryAsync("<partyId>", "<boundaryId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("geometry").GetProperty("type").ToString());
@@ -279,18 +281,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetBoundary(string,string,RequestContext)">
-<example>
-This sample shows how to call GetBoundary with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBoundary and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetBoundary("<partyId>", "<boundaryId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetBoundary with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetBoundary("<partyId>", "<boundaryId>", new RequestContext());
+Response response = client.GetBoundary("<partyId>", "<boundaryId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("geometry").GetProperty("type").ToString());
@@ -313,536 +324,712 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<boundaryId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<boundaryId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<boundaryId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<boundaryId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetOverlapAsync(string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetOverlapAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetOverlapAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetOverlapAsync("<partyId>", "<boundaryId>", "<otherPartyId>", "<otherBoundaryId>", new RequestContext());
+Response response = await client.GetOverlapAsync("<partyId>", "<boundaryId>", "<otherPartyId>", "<otherBoundaryId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetOverlapAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetOverlapAsync("<partyId>", "<boundaryId>", "<otherPartyId>", "<otherBoundaryId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("boundaryArea").ToString());
 Console.WriteLine(result.GetProperty("otherBoundaryArea").ToString());
 Console.WriteLine(result.GetProperty("intersectingArea").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetOverlap(string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetOverlap with required parameters and parse the result.
+      <example>
+This sample shows how to call GetOverlap and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetOverlap("<partyId>", "<boundaryId>", "<otherPartyId>", "<otherBoundaryId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetOverlap with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetOverlap("<partyId>", "<boundaryId>", "<otherPartyId>", "<otherBoundaryId>", new RequestContext());
+Response response = client.GetOverlap("<partyId>", "<boundaryId>", "<otherPartyId>", "<otherBoundaryId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("boundaryArea").ToString());
 Console.WriteLine(result.GetProperty("otherBoundaryArea").ToString());
 Console.WriteLine(result.GetProperty("intersectingArea").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetBoundariesAsync(string,string,IEnumerable{string},double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetBoundariesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBoundariesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetBoundariesAsync("<parentType>", "<type>", new String[]{"<parentIds>"}, 3.14, 3.14, new String[]{"<boundaryIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetBoundariesAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("parentType").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetBoundariesAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetBoundariesAsync("<parentType>", "<type>", new List<string>()
+{
+"<parentIds>"
+}, 123.45, 123.45, new List<string>()
+{
+"<boundaryIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("parentType").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetBoundaries(string,string,IEnumerable{string},double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetBoundaries with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBoundaries and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetBoundaries("<parentType>", "<type>", new String[]{"<parentIds>"}, 3.14, 3.14, new String[]{"<boundaryIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetBoundaries(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("parentType").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetBoundaries with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetBoundaries("<parentType>", "<type>", new List<string>()
+{
+"<parentIds>"
+}, 123.45, 123.45, new List<string>()
+{
+"<boundaryIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("parentType").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="SearchAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call SearchAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-await foreach (var item in client.SearchAsync(RequestContent.Create(data)))
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+await foreach (BinaryData item in client.SearchAsync(content))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-This sample shows how to call SearchAsync with all request content, and how to parse the result.
+This sample shows how to call SearchAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    ids = new[] {
-        "<String>"
-    },
-    names = new[] {
-        "<String>"
-    },
-    propertyFilters = new[] {
-        "<String>"
-    },
-    statuses = new[] {
-        "<String>"
-    },
-    minCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-    maxCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-    minLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    maxLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    maxPageSize = 1234,
-    skipToken = "<skipToken>",
-    parentType = "Field",
-    type = "<type>",
-    parentIds = new[] {
-        "<String>"
-    },
-    minArea = 123.45d,
-    maxArea = 123.45d,
-    intersectsWithGeometry = new {
-        coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-        type = "MultiPolygon",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["ids"] = new List<object>()
+{
+"<ids>"
+},
+    ["names"] = new List<object>()
+{
+"<names>"
+},
+    ["propertyFilters"] = new List<object>()
+{
+"<propertyFilters>"
+},
+    ["statuses"] = new List<object>()
+{
+"<statuses>"
+},
+    ["minCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["maxCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["minLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["maxLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["maxPageSize"] = 1234,
+    ["skipToken"] = "<skipToken>",
+    ["parentType"] = "Field",
+    ["type"] = "<type>",
+    ["parentIds"] = new List<object>()
+{
+"<parentIds>"
+},
+    ["minArea"] = 123.45,
+    ["maxArea"] = 123.45,
+    ["intersectsWithGeometry"] = new Dictionary<string, object>()
+    {
+        ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+        ["type"] = "MultiPolygon",
     },
-};
-
-await foreach (var item in client.SearchAsync(RequestContent.Create(data)))
+});
+await foreach (BinaryData item in client.SearchAsync(content))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("parentType").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("parentType").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="Search(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call Search and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.Search(RequestContent.Create(data)))
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+foreach (BinaryData item in client.Search(content))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-This sample shows how to call Search with all request content, and how to parse the result.
+This sample shows how to call Search with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    ids = new[] {
-        "<String>"
-    },
-    names = new[] {
-        "<String>"
-    },
-    propertyFilters = new[] {
-        "<String>"
-    },
-    statuses = new[] {
-        "<String>"
-    },
-    minCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-    maxCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-    minLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    maxLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    maxPageSize = 1234,
-    skipToken = "<skipToken>",
-    parentType = "Field",
-    type = "<type>",
-    parentIds = new[] {
-        "<String>"
-    },
-    minArea = 123.45d,
-    maxArea = 123.45d,
-    intersectsWithGeometry = new {
-        coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-        type = "MultiPolygon",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["ids"] = new List<object>()
+{
+"<ids>"
+},
+    ["names"] = new List<object>()
+{
+"<names>"
+},
+    ["propertyFilters"] = new List<object>()
+{
+"<propertyFilters>"
+},
+    ["statuses"] = new List<object>()
+{
+"<statuses>"
+},
+    ["minCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["maxCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["minLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["maxLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["maxPageSize"] = 1234,
+    ["skipToken"] = "<skipToken>",
+    ["parentType"] = "Field",
+    ["type"] = "<type>",
+    ["parentIds"] = new List<object>()
+{
+"<parentIds>"
+},
+    ["minArea"] = 123.45,
+    ["maxArea"] = 123.45,
+    ["intersectsWithGeometry"] = new Dictionary<string, object>()
+    {
+        ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+        ["type"] = "MultiPolygon",
     },
-};
-
-foreach (var item in client.Search(RequestContent.Create(data)))
+});
+foreach (BinaryData item in client.Search(content))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("parentType").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("parentType").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetBoundariesByPartyIdAsync(string,string,string,IEnumerable{string},double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetBoundariesByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBoundariesByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetBoundariesByPartyIdAsync("<partyId>", "<parentType>", "<type>", new String[]{"<parentIds>"}, 3.14, 3.14, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetBoundariesByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("parentType").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetBoundariesByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetBoundariesByPartyIdAsync("<partyId>", "<parentType>", "<type>", new List<string>()
+{
+"<parentIds>"
+}, 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("parentType").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetBoundariesByPartyId(string,string,string,IEnumerable{string},double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetBoundariesByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBoundariesByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetBoundariesByPartyId("<partyId>", "<parentType>", "<type>", new String[]{"<parentIds>"}, 3.14, 3.14, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetBoundariesByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("parentType").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetBoundariesByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetBoundariesByPartyId("<partyId>", "<parentType>", "<type>", new List<string>()
+{
+"<parentIds>"
+}, 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("parentType").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="SearchByPartyIdAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call SearchByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call SearchByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-await foreach (var item in client.SearchByPartyIdAsync("<partyId>", RequestContent.Create(data)))
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+await foreach (BinaryData item in client.SearchByPartyIdAsync("<partyId>", content))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-This sample shows how to call SearchByPartyIdAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call SearchByPartyIdAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    ids = new[] {
-        "<String>"
-    },
-    names = new[] {
-        "<String>"
-    },
-    propertyFilters = new[] {
-        "<String>"
-    },
-    statuses = new[] {
-        "<String>"
-    },
-    minCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-    maxCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-    minLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    maxLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    maxPageSize = 1234,
-    skipToken = "<skipToken>",
-    parentType = "Field",
-    type = "<type>",
-    parentIds = new[] {
-        "<String>"
-    },
-    minArea = 123.45d,
-    maxArea = 123.45d,
-    intersectsWithGeometry = new {
-        coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-        type = "MultiPolygon",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["ids"] = new List<object>()
+{
+"<ids>"
+},
+    ["names"] = new List<object>()
+{
+"<names>"
+},
+    ["propertyFilters"] = new List<object>()
+{
+"<propertyFilters>"
+},
+    ["statuses"] = new List<object>()
+{
+"<statuses>"
+},
+    ["minCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["maxCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["minLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["maxLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["maxPageSize"] = 1234,
+    ["skipToken"] = "<skipToken>",
+    ["parentType"] = "Field",
+    ["type"] = "<type>",
+    ["parentIds"] = new List<object>()
+{
+"<parentIds>"
+},
+    ["minArea"] = 123.45,
+    ["maxArea"] = 123.45,
+    ["intersectsWithGeometry"] = new Dictionary<string, object>()
+    {
+        ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+        ["type"] = "MultiPolygon",
     },
-};
-
-await foreach (var item in client.SearchByPartyIdAsync("<partyId>", RequestContent.Create(data)))
+});
+await foreach (BinaryData item in client.SearchByPartyIdAsync("<partyId>", content))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("parentType").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("parentType").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="SearchByPartyId(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call SearchByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call SearchByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.SearchByPartyId("<partyId>", RequestContent.Create(data)))
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+foreach (BinaryData item in client.SearchByPartyId("<partyId>", content))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-This sample shows how to call SearchByPartyId with all parameters and request content, and how to parse the result.
+This sample shows how to call SearchByPartyId with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    ids = new[] {
-        "<String>"
-    },
-    names = new[] {
-        "<String>"
-    },
-    propertyFilters = new[] {
-        "<String>"
-    },
-    statuses = new[] {
-        "<String>"
-    },
-    minCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-    maxCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-    minLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    maxLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    maxPageSize = 1234,
-    skipToken = "<skipToken>",
-    parentType = "Field",
-    type = "<type>",
-    parentIds = new[] {
-        "<String>"
-    },
-    minArea = 123.45d,
-    maxArea = 123.45d,
-    intersectsWithGeometry = new {
-        coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-        type = "MultiPolygon",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["ids"] = new List<object>()
+{
+"<ids>"
+},
+    ["names"] = new List<object>()
+{
+"<names>"
+},
+    ["propertyFilters"] = new List<object>()
+{
+"<propertyFilters>"
+},
+    ["statuses"] = new List<object>()
+{
+"<statuses>"
+},
+    ["minCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["maxCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["minLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["maxLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["maxPageSize"] = 1234,
+    ["skipToken"] = "<skipToken>",
+    ["parentType"] = "Field",
+    ["type"] = "<type>",
+    ["parentIds"] = new List<object>()
+{
+"<parentIds>"
+},
+    ["minArea"] = 123.45,
+    ["maxArea"] = 123.45,
+    ["intersectsWithGeometry"] = new Dictionary<string, object>()
+    {
+        ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+        ["type"] = "MultiPolygon",
     },
-};
-
-foreach (var item in client.SearchByPartyId("<partyId>", RequestContent.Create(data)))
+});
+foreach (BinaryData item in client.SearchByPartyId("<partyId>", content))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("parentType").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("parentType").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<boundaryId>", null);
+BinaryData responseData = operation.Value;
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<boundaryId>", new RequestContext());
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<boundaryId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -856,19 +1043,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<boundaryId>", new RequestContext());
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<boundaryId>", null);
+BinaryData responseData = operation.Value;
+
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<boundaryId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -882,8 +1081,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/CropProducts.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/CropProducts.xml
index cf1974df695a..17b31f28ce21 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/CropProducts.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/CropProducts.xml
@@ -2,13 +2,23 @@
 <doc>
   <members>
     <member name="GetCropProductAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCropProductAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCropProductAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCropProductAsync("<cropProductId>", new RequestContext());
+Response response = await client.GetCropProductAsync("<cropProductId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCropProductAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCropProductAsync("<cropProductId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("cropIds")[0].ToString());
@@ -28,18 +38,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetCropProduct(string,RequestContext)">
-<example>
-This sample shows how to call GetCropProduct with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCropProduct and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCropProduct("<cropProductId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCropProduct with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCropProduct("<cropProductId>", new RequestContext());
+Response response = client.GetCropProduct("<cropProductId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("cropIds")[0].ToString());
@@ -59,53 +78,55 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<cropProductId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<cropProductId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    cropIds = new[] {
-        "<String>"
-    },
-    brand = "<brand>",
-    product = "<product>",
-    trait = "<trait>",
-    relativeMaturity = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    treatments = new[] {
-        "<String>"
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["cropIds"] = new List<object>()
+{
+"<cropIds>"
+},
+    ["brand"] = "<brand>",
+    ["product"] = "<product>",
+    ["trait"] = "<trait>",
+    ["relativeMaturity"] = new Dictionary<string, object>()
+    {
+        ["unit"] = "<unit>",
+        ["value"] = 123.45,
     },
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["treatments"] = new List<object>()
+{
+"<treatments>"
+},
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<cropProductId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<cropProductId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("cropIds")[0].ToString());
@@ -125,53 +146,55 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = client.CreateOrUpdate("<cropProductId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<cropProductId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    cropIds = new[] {
-        "<String>"
-    },
-    brand = "<brand>",
-    product = "<product>",
-    trait = "<trait>",
-    relativeMaturity = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    treatments = new[] {
-        "<String>"
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["cropIds"] = new List<object>()
+{
+"<cropIds>"
+},
+    ["brand"] = "<brand>",
+    ["product"] = "<product>",
+    ["trait"] = "<trait>",
+    ["relativeMaturity"] = new Dictionary<string, object>()
+    {
+        ["unit"] = "<unit>",
+        ["value"] = 123.45,
     },
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["treatments"] = new List<object>()
+{
+"<treatments>"
+},
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.CreateOrUpdate("<cropProductId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<cropProductId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("cropIds")[0].ToString());
@@ -191,97 +214,178 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<cropProductId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<cropProductId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<cropProductId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<cropProductId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetCropProductsAsync(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetCropProductsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCropProductsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetCropProductsAsync(new String[]{"<cropIds>"}, new String[]{"<brands>"}, new String[]{"<products>"}, new String[]{"<traits>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetCropProductsAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("cropIds")[0].ToString());
-    Console.WriteLine(result.GetProperty("brand").ToString());
-    Console.WriteLine(result.GetProperty("product").ToString());
-    Console.WriteLine(result.GetProperty("trait").ToString());
-    Console.WriteLine(result.GetProperty("relativeMaturity").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("relativeMaturity").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("treatments")[0].ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetCropProductsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetCropProductsAsync(new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<brands>"
+}, new List<string>()
+{
+"<products>"
+}, new List<string>()
+{
+"<traits>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("cropIds")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("brand").ToString());
+    Console.WriteLine(result[0].GetProperty("product").ToString());
+    Console.WriteLine(result[0].GetProperty("trait").ToString());
+    Console.WriteLine(result[0].GetProperty("relativeMaturity").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("relativeMaturity").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("treatments")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetCropProducts(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetCropProducts with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCropProducts and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetCropProducts(new String[]{"<cropIds>"}, new String[]{"<brands>"}, new String[]{"<products>"}, new String[]{"<traits>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetCropProducts(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("cropIds")[0].ToString());
-    Console.WriteLine(result.GetProperty("brand").ToString());
-    Console.WriteLine(result.GetProperty("product").ToString());
-    Console.WriteLine(result.GetProperty("trait").ToString());
-    Console.WriteLine(result.GetProperty("relativeMaturity").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("relativeMaturity").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("treatments")[0].ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetCropProducts with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetCropProducts(new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<brands>"
+}, new List<string>()
+{
+"<products>"
+}, new List<string>()
+{
+"<traits>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("cropIds")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("brand").ToString());
+    Console.WriteLine(result[0].GetProperty("product").ToString());
+    Console.WriteLine(result[0].GetProperty("trait").ToString());
+    Console.WriteLine(result[0].GetProperty("relativeMaturity").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("relativeMaturity").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("treatments")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Crops.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Crops.xml
index 0647a12446d5..7c01e2a287aa 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Crops.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Crops.xml
@@ -2,19 +2,29 @@
 <doc>
   <members>
     <member name="GetCropAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCropAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCropAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCropAsync("<cropId>", new RequestContext());
+Response response = await client.GetCropAsync("<cropId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCropAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCropAsync("<cropId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("phenotype").ToString());
 Console.WriteLine(result.GetProperty("breedingMethod").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -25,24 +35,33 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetCrop(string,RequestContext)">
-<example>
-This sample shows how to call GetCrop with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCrop and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCrop("<cropId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCrop with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCrop("<cropId>", new RequestContext());
+Response response = client.GetCrop("<cropId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("phenotype").ToString());
 Console.WriteLine(result.GetProperty("breedingMethod").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -53,54 +72,55 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<cropId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<cropId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    phenotype = "<phenotype>",
-    breedingMethod = "VARIETY",
-    measurements = new {
-        key = new {
-            unit = "<unit>",
-            value = 123.45d,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["phenotype"] = "<phenotype>",
+    ["breedingMethod"] = "VARIETY",
+    ["measurements"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["unit"] = "<unit>",
+            ["value"] = 123.45,
         },
     },
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<cropId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<cropId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("phenotype").ToString());
 Console.WriteLine(result.GetProperty("breedingMethod").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -111,54 +131,55 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<cropId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<cropId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    phenotype = "<phenotype>",
-    breedingMethod = "VARIETY",
-    measurements = new {
-        key = new {
-            unit = "<unit>",
-            value = 123.45d,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["phenotype"] = "<phenotype>",
+    ["breedingMethod"] = "VARIETY",
+    ["measurements"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["unit"] = "<unit>",
+            ["value"] = 123.45,
         },
     },
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.CreateOrUpdate("<cropId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<cropId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("phenotype").ToString());
 Console.WriteLine(result.GetProperty("breedingMethod").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -169,91 +190,160 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<cropId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<cropId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<cropId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<cropId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetCropsAsync(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetCropsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCropsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetCropsAsync(new String[]{"<phenotypes>"}, new String[]{"<breedingMethods>"}, new String[]{"<cropIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetCropsAsync(null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("phenotype").ToString());
-    Console.WriteLine(result.GetProperty("breedingMethod").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetCropsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetCropsAsync(new List<string>()
+{
+"<phenotypes>"
+}, new List<string>()
+{
+"<breedingMethods>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("phenotype").ToString());
+    Console.WriteLine(result[0].GetProperty("breedingMethod").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetCrops(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetCrops with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCrops and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetCrops(new String[]{"<phenotypes>"}, new String[]{"<breedingMethods>"}, new String[]{"<cropIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetCrops(null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("phenotype").ToString());
-    Console.WriteLine(result.GetProperty("breedingMethod").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetCrops with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetCrops(new List<string>()
+{
+"<phenotypes>"
+}, new List<string>()
+{
+"<breedingMethods>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("phenotype").ToString());
+    Console.WriteLine(result[0].GetProperty("breedingMethod").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/DeviceDataModels.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/DeviceDataModels.xml
index da0067f8ae13..ad4df52ee478 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/DeviceDataModels.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/DeviceDataModels.xml
@@ -2,43 +2,45 @@
 <doc>
   <members>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceDataModelId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceDataModelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    type = "<type>",
-    manufacturer = "<manufacturer>",
-    productCode = "<productCode>",
-    ports = new[] {
-        new {
-            name = "<name>",
-            type = "<type>",
-        }
-    },
-    status = "<status>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["type"] = "<type>",
+    ["manufacturer"] = "<manufacturer>",
+    ["productCode"] = "<productCode>",
+    ["ports"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["type"] = "<type>",
+}
+},
+    ["status"] = "<status>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceDataModelId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceDataModelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("type").ToString());
@@ -56,48 +58,49 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceDataModelId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceDataModelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    type = "<type>",
-    manufacturer = "<manufacturer>",
-    productCode = "<productCode>",
-    ports = new[] {
-        new {
-            name = "<name>",
-            type = "<type>",
-        }
-    },
-    status = "<status>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["type"] = "<type>",
+    ["manufacturer"] = "<manufacturer>",
+    ["productCode"] = "<productCode>",
+    ["ports"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["type"] = "<type>",
+}
+},
+    ["status"] = "<status>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceDataModelId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceDataModelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("type").ToString());
@@ -115,18 +118,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetDeviceDataModelAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceDataModelAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceDataModelAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetDeviceDataModelAsync("<sensorPartnerId>", "<deviceDataModelId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetDeviceDataModelAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetDeviceDataModelAsync("<sensorPartnerId>", "<deviceDataModelId>", new RequestContext());
+Response response = await client.GetDeviceDataModelAsync("<sensorPartnerId>", "<deviceDataModelId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("type").ToString());
@@ -144,18 +156,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetDeviceDataModel(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceDataModel with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceDataModel and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetDeviceDataModel("<sensorPartnerId>", "<deviceDataModelId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetDeviceDataModel with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetDeviceDataModel("<sensorPartnerId>", "<deviceDataModelId>", new RequestContext());
+Response response = client.GetDeviceDataModel("<sensorPartnerId>", "<deviceDataModelId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("type").ToString());
@@ -173,93 +194,150 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<sensorPartnerId>", "<deviceDataModelId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<sensorPartnerId>", "<deviceDataModelId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<sensorPartnerId>", "<deviceDataModelId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<sensorPartnerId>", "<deviceDataModelId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetDeviceDataModelsAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceDataModelsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceDataModelsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetDeviceDataModelsAsync("<sensorPartnerId>", new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetDeviceDataModelsAsync("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("manufacturer").ToString());
-    Console.WriteLine(result.GetProperty("productCode").ToString());
-    Console.WriteLine(result.GetProperty("ports")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("ports")[0].GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetDeviceDataModelsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetDeviceDataModelsAsync("<sensorPartnerId>", new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("manufacturer").ToString());
+    Console.WriteLine(result[0].GetProperty("productCode").ToString());
+    Console.WriteLine(result[0].GetProperty("ports")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("ports")[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetDeviceDataModels(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceDataModels with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceDataModels and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetDeviceDataModels("<sensorPartnerId>", new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetDeviceDataModels("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("manufacturer").ToString());
-    Console.WriteLine(result.GetProperty("productCode").ToString());
-    Console.WriteLine(result.GetProperty("ports")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("ports")[0].GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetDeviceDataModels with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetDeviceDataModels("<sensorPartnerId>", new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("manufacturer").ToString());
+    Console.WriteLine(result[0].GetProperty("productCode").ToString());
+    Console.WriteLine(result[0].GetProperty("ports")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("ports")[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Devices.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Devices.xml
index b162a5ffdb68..37943d631aec 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Devices.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Devices.xml
@@ -2,44 +2,45 @@
 <doc>
   <members>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    deviceDataModelId = "<deviceDataModelId>",
-    integrationId = "<integrationId>",
-    type = "<type>",
-    hardwareId = "<hardwareId>",
-    reportingIntervalInSeconds = 1234,
-    parentDeviceId = "<parentDeviceId>",
-    location = new {
-        latitude = 123.45d,
-        longitude = 123.45d,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["deviceDataModelId"] = "<deviceDataModelId>",
+    ["integrationId"] = "<integrationId>",
+    ["type"] = "<type>",
+    ["hardwareId"] = "<hardwareId>",
+    ["reportingIntervalInSeconds"] = 1234,
+    ["parentDeviceId"] = "<parentDeviceId>",
+    ["location"] = new Dictionary<string, object>()
+    {
+        ["latitude"] = 123.45,
+        ["longitude"] = 123.45,
     },
-    status = "<status>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["status"] = "<status>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("deviceDataModelId").ToString());
@@ -60,49 +61,49 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    deviceDataModelId = "<deviceDataModelId>",
-    integrationId = "<integrationId>",
-    type = "<type>",
-    hardwareId = "<hardwareId>",
-    reportingIntervalInSeconds = 1234,
-    parentDeviceId = "<parentDeviceId>",
-    location = new {
-        latitude = 123.45d,
-        longitude = 123.45d,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["deviceDataModelId"] = "<deviceDataModelId>",
+    ["integrationId"] = "<integrationId>",
+    ["type"] = "<type>",
+    ["hardwareId"] = "<hardwareId>",
+    ["reportingIntervalInSeconds"] = 1234,
+    ["parentDeviceId"] = "<parentDeviceId>",
+    ["location"] = new Dictionary<string, object>()
+    {
+        ["latitude"] = 123.45,
+        ["longitude"] = 123.45,
     },
-    status = "<status>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["status"] = "<status>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("deviceDataModelId").ToString());
@@ -123,18 +124,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetDeviceAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetDeviceAsync("<sensorPartnerId>", "<deviceId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetDeviceAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetDeviceAsync("<sensorPartnerId>", "<deviceId>", new RequestContext());
+Response response = await client.GetDeviceAsync("<sensorPartnerId>", "<deviceId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("deviceDataModelId").ToString());
@@ -155,18 +165,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetDevice(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDevice with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDevice and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetDevice("<sensorPartnerId>", "<deviceId>", new RequestContext());
+Response response = client.GetDevice("<sensorPartnerId>", "<deviceId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetDevice with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetDevice("<sensorPartnerId>", "<deviceId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("deviceDataModelId").ToString());
@@ -187,99 +206,168 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<sensorPartnerId>", "<deviceId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<sensorPartnerId>", "<deviceId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<sensorPartnerId>", "<deviceId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<sensorPartnerId>", "<deviceId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetDevicesAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetDevicesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDevicesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetDevicesAsync("<sensorPartnerId>", new String[]{"<parentDeviceIds>"}, new String[]{"<deviceDataModelIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetDevicesAsync("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceDataModelId").ToString());
-    Console.WriteLine(result.GetProperty("integrationId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("hardwareId").ToString());
-    Console.WriteLine(result.GetProperty("reportingIntervalInSeconds").ToString());
-    Console.WriteLine(result.GetProperty("parentDeviceId").ToString());
-    Console.WriteLine(result.GetProperty("location").GetProperty("latitude").ToString());
-    Console.WriteLine(result.GetProperty("location").GetProperty("longitude").ToString());
-    Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetDevicesAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetDevicesAsync("<sensorPartnerId>", new List<string>()
+{
+"<parentDeviceIds>"
+}, new List<string>()
+{
+"<deviceDataModelIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("deviceDataModelId").ToString());
+    Console.WriteLine(result[0].GetProperty("integrationId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareId").ToString());
+    Console.WriteLine(result[0].GetProperty("reportingIntervalInSeconds").ToString());
+    Console.WriteLine(result[0].GetProperty("parentDeviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+    Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetDevices(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetDevices with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDevices and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetDevices("<sensorPartnerId>", new String[]{"<parentDeviceIds>"}, new String[]{"<deviceDataModelIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetDevices("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceDataModelId").ToString());
-    Console.WriteLine(result.GetProperty("integrationId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("hardwareId").ToString());
-    Console.WriteLine(result.GetProperty("reportingIntervalInSeconds").ToString());
-    Console.WriteLine(result.GetProperty("parentDeviceId").ToString());
-    Console.WriteLine(result.GetProperty("location").GetProperty("latitude").ToString());
-    Console.WriteLine(result.GetProperty("location").GetProperty("longitude").ToString());
-    Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetDevices with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetDevices("<sensorPartnerId>", new List<string>()
+{
+"<parentDeviceIds>"
+}, new List<string>()
+{
+"<deviceDataModelIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("deviceDataModelId").ToString());
+    Console.WriteLine(result[0].GetProperty("integrationId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareId").ToString());
+    Console.WriteLine(result[0].GetProperty("reportingIntervalInSeconds").ToString());
+    Console.WriteLine(result[0].GetProperty("parentDeviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+    Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/FarmBeatsClient.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/FarmBeatsClient.xml
index 4bdc95ef5e44..54fab2140e5d 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/FarmBeatsClient.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/FarmBeatsClient.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <doc>
-  <members>
-  </members>
+  <members />
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/FarmOperationsDataIngestion.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/FarmOperationsDataIngestion.xml
index 325886caddbc..86ce13a16404 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/FarmOperationsDataIngestion.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/FarmOperationsDataIngestion.xml
@@ -2,13 +2,25 @@
 <doc>
   <members>
     <member name="GetJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("authProviderId").ToString());
+Console.WriteLine(result.GetProperty("startYear").ToString());
+]]></code>
+This sample shows how to call GetJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -29,18 +41,29 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetJobDetails and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetJobDetails("<jobId>", new RequestContext());
+Response response = client.GetJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("authProviderId").ToString());
+Console.WriteLine(result.GetProperty("startYear").ToString());
+]]></code>
+This sample shows how to call GetJobDetails with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -61,54 +84,55 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateJobAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateJobAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    authProviderId = "<authProviderId>",
-    startYear = 1234,
-};
-
-var operation = await client.CreateJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+TokenCredential credential = new DefaultAzureCredential();
+FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["authProviderId"] = "<authProviderId>",
+    ["startYear"] = 1234,
+});
+Operation<BinaryData> operation = await client.CreateJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("authProviderId").ToString());
 Console.WriteLine(result.GetProperty("startYear").ToString());
 ]]></code>
-This sample shows how to call CreateJobAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateJobAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    authProviderId = "<authProviderId>",
-    operations = new[] {
-        "<String>"
-    },
-    startYear = 1234,
-    isIncremental = true,
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["authProviderId"] = "<authProviderId>",
+    ["operations"] = new List<object>()
+{
+"<operations>"
+},
+    ["startYear"] = 1234,
+    ["isIncremental"] = true,
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = await client.CreateJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = await client.CreateJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("authProviderId").ToString());
@@ -128,54 +152,55 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateJob(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateJob with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    authProviderId = "<authProviderId>",
-    startYear = 1234,
-};
-
-var operation = client.CreateJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+TokenCredential credential = new DefaultAzureCredential();
+FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["authProviderId"] = "<authProviderId>",
+    ["startYear"] = 1234,
+});
+Operation<BinaryData> operation = client.CreateJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("authProviderId").ToString());
 Console.WriteLine(result.GetProperty("startYear").ToString());
 ]]></code>
-This sample shows how to call CreateJob with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateJob with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    authProviderId = "<authProviderId>",
-    operations = new[] {
-        "<String>"
-    },
-    startYear = 1234,
-    isIncremental = true,
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["authProviderId"] = "<authProviderId>",
+    ["operations"] = new List<object>()
+{
+"<operations>"
+},
+    ["startYear"] = 1234,
+    ["isIncremental"] = true,
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = client.CreateJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = client.CreateJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("authProviderId").ToString());
@@ -195,9 +220,8 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/FarmerOAuthTokens.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/FarmerOAuthTokens.xml
index 5843f08a8040..fc3b75c0f3c1 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/FarmerOAuthTokens.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/FarmerOAuthTokens.xml
@@ -2,87 +2,97 @@
 <doc>
   <members>
     <member name="GetOAuthConnectionLinkAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call GetOAuthConnectionLinkAsync with required request content, and how to parse the result.
+      <example>
+This sample shows how to call GetOAuthConnectionLinkAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    partyId = "<partyId>",
-    oAuthProviderId = "<oAuthProviderId>",
-    userRedirectLink = "<userRedirectLink>",
-};
-
-Response response = await client.GetOAuthConnectionLinkAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["oAuthProviderId"] = "<oAuthProviderId>",
+    ["userRedirectLink"] = "<userRedirectLink>",
+});
+Response response = await client.GetOAuthConnectionLinkAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call GetOAuthConnectionLinkAsync with all request content, and how to parse the result.
+This sample shows how to call GetOAuthConnectionLinkAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    partyId = "<partyId>",
-    oAuthProviderId = "<oAuthProviderId>",
-    userRedirectLink = "<userRedirectLink>",
-    userRedirectState = "<userRedirectState>",
-};
-
-Response response = await client.GetOAuthConnectionLinkAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["oAuthProviderId"] = "<oAuthProviderId>",
+    ["userRedirectLink"] = "<userRedirectLink>",
+    ["userRedirectState"] = "<userRedirectState>",
+});
+Response response = await client.GetOAuthConnectionLinkAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetOAuthConnectionLink(RequestContent,RequestContext)">
-<example>
-This sample shows how to call GetOAuthConnectionLink with required request content, and how to parse the result.
+      <example>
+This sample shows how to call GetOAuthConnectionLink and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    oAuthProviderId = "<oAuthProviderId>",
-    userRedirectLink = "<userRedirectLink>",
-};
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetOAuthConnectionLink(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["oAuthProviderId"] = "<oAuthProviderId>",
+    ["userRedirectLink"] = "<userRedirectLink>",
+});
+Response response = client.GetOAuthConnectionLink(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call GetOAuthConnectionLink with all request content, and how to parse the result.
+This sample shows how to call GetOAuthConnectionLink with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    oAuthProviderId = "<oAuthProviderId>",
-    userRedirectLink = "<userRedirectLink>",
-    userRedirectState = "<userRedirectState>",
-};
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetOAuthConnectionLink(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["oAuthProviderId"] = "<oAuthProviderId>",
+    ["userRedirectLink"] = "<userRedirectLink>",
+    ["userRedirectState"] = "<userRedirectState>",
+});
+Response response = client.GetOAuthConnectionLink(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -97,17 +107,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -122,59 +143,105 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAuthenticatedFarmersDetailsAsync(IEnumerable{string},IEnumerable{string},bool?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAuthenticatedFarmersDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAuthenticatedFarmersDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetAuthenticatedFarmersDetailsAsync(new String[]{"<authProviderIds>"}, new String[]{"<partyIds>"}, true, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetAuthenticatedFarmersDetailsAsync(null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("authProviderId").ToString());
-    Console.WriteLine(result.GetProperty("isValid").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("authProviderId").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAuthenticatedFarmersDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetAuthenticatedFarmersDetailsAsync(new List<string>()
+{
+"<authProviderIds>"
+}, new List<string>()
+{
+"<partyIds>"
+}, true, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("authProviderId").ToString());
+    Console.WriteLine(result[0].GetProperty("isValid").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAuthenticatedFarmersDetails(IEnumerable{string},IEnumerable{string},bool?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAuthenticatedFarmersDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAuthenticatedFarmersDetails and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetAuthenticatedFarmersDetails(new String[]{"<authProviderIds>"}, new String[]{"<partyIds>"}, true, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetAuthenticatedFarmersDetails(null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("authProviderId").ToString());
-    Console.WriteLine(result.GetProperty("isValid").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("authProviderId").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAuthenticatedFarmersDetails with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetAuthenticatedFarmersDetails(new List<string>()
+{
+"<authProviderIds>"
+}, new List<string>()
+{
+"<partyIds>"
+}, true, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("authProviderId").ToString());
+    Console.WriteLine(result[0].GetProperty("isValid").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<oauthProviderId>", new RequestContext());
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<oauthProviderId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<oauthProviderId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -188,19 +255,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<oauthProviderId>", new RequestContext());
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<oauthProviderId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<oauthProviderId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -214,8 +293,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Farms.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Farms.xml
index 9f61bd5c7853..ddb392882dbd 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Farms.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Farms.xml
@@ -2,13 +2,25 @@
 <doc>
   <members>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -23,17 +35,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -48,17 +71,26 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetFarmAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetFarmAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFarmAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetFarmAsync("<partyId>", "<farmId>", new RequestContext());
+Response response = await client.GetFarmAsync("<partyId>", "<farmId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetFarmAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetFarmAsync("<partyId>", "<farmId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -72,18 +104,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetFarm(string,string,RequestContext)">
-<example>
-This sample shows how to call GetFarm with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFarm and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetFarm("<partyId>", "<farmId>", new RequestContext());
+Response response = client.GetFarm("<partyId>", "<farmId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetFarm with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetFarm("<partyId>", "<farmId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -97,40 +138,39 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<farmId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<farmId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
-
-var data = new {
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<farmId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<farmId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -144,40 +184,39 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = client.CreateOrUpdate("<partyId>", "<farmId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<farmId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
-
-var data = new {
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<farmId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = client.CreateOrUpdate("<partyId>", "<farmId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -191,148 +230,262 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<farmId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<farmId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<farmId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<farmId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetFarmsAsync(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetFarmsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFarmsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetFarmsAsync(new String[]{"<farmIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetFarmsAsync(null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetFarmsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetFarmsAsync(new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetFarms(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetFarms with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFarms and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetFarms(new String[]{"<farmIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetFarms(null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetFarms with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetFarms(new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetFarmsByPartyIdAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetFarmsByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFarmsByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetFarmsByPartyIdAsync("<partyId>", new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetFarmsByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetFarmsByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetFarmsByPartyIdAsync("<partyId>", new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetFarmsByPartyId(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetFarmsByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFarmsByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetFarmsByPartyId("<partyId>", new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetFarmsByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetFarmsByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetFarmsByPartyId("<partyId>", new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<farmId>", new RequestContext());
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<farmId>", null);
+BinaryData responseData = operation.Value;
+
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<farmId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -346,19 +499,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<farmId>", new RequestContext());
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<farmId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<farmId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -372,8 +537,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Fields.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Fields.xml
index 88548cbba531..7cd4a4a18cdb 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Fields.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Fields.xml
@@ -2,13 +2,25 @@
 <doc>
   <members>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -23,17 +35,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -48,17 +71,26 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetFieldAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetFieldAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFieldAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetFieldAsync("<partyId>", "<fieldId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetFieldAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetFieldAsync("<partyId>", "<fieldId>", new RequestContext());
+Response response = await client.GetFieldAsync("<partyId>", "<fieldId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("farmId").ToString());
@@ -73,18 +105,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetField(string,string,RequestContext)">
-<example>
-This sample shows how to call GetField with required parameters and parse the result.
+      <example>
+This sample shows how to call GetField and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetField("<partyId>", "<fieldId>", new RequestContext());
+Response response = client.GetField("<partyId>", "<fieldId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetField with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetField("<partyId>", "<fieldId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("farmId").ToString());
@@ -99,41 +140,40 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<fieldId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<fieldId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
-
-var data = new {
-    farmId = "<farmId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<fieldId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["farmId"] = "<farmId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<fieldId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("farmId").ToString());
@@ -148,41 +188,40 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = client.CreateOrUpdate("<partyId>", "<fieldId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<fieldId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
-
-var data = new {
-    farmId = "<farmId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<fieldId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["farmId"] = "<farmId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = client.CreateOrUpdate("<partyId>", "<fieldId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("farmId").ToString());
@@ -197,152 +236,278 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<fieldId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<fieldId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<fieldId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<fieldId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetFieldsAsync(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetFieldsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFieldsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetFieldsAsync(new String[]{"<farmIds>"}, new String[]{"<fieldIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetFieldsAsync(null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("farmId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetFieldsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetFieldsAsync(new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("farmId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetFields(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetFields with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFields and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetFields(new String[]{"<farmIds>"}, new String[]{"<fieldIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetFields(null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("farmId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetFields with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetFields(new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("farmId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetFieldsByPartyIdAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetFieldsByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFieldsByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetFieldsByPartyIdAsync("<partyId>", new String[]{"<farmIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetFieldsByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("farmId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetFieldsByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetFieldsByPartyIdAsync("<partyId>", new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("farmId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetFieldsByPartyId(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetFieldsByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFieldsByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetFieldsByPartyId("<partyId>", new String[]{"<farmIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetFieldsByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("farmId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetFieldsByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetFieldsByPartyId("<partyId>", new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("farmId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<fieldId>", new RequestContext());
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<fieldId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<fieldId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -356,19 +521,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<fieldId>", new RequestContext());
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<fieldId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<fieldId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -382,8 +559,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/HarvestData.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/HarvestData.xml
index 179cab5df4b7..d6eefda3c706 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/HarvestData.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/HarvestData.xml
@@ -2,13 +2,25 @@
 <doc>
   <members>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -23,17 +35,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -48,17 +71,26 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetHarvestDataAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetHarvestDataAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetHarvestDataAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetHarvestDataAsync("<partyId>", "<harvestDataId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetHarvestDataAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetHarvestDataAsync("<partyId>", "<harvestDataId>", new RequestContext());
+Response response = await client.GetHarvestDataAsync("<partyId>", "<harvestDataId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
@@ -104,18 +136,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetHarvestData(string,string,RequestContext)">
-<example>
-This sample shows how to call GetHarvestData with required parameters and parse the result.
+      <example>
+This sample shows how to call GetHarvestData and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetHarvestData("<partyId>", "<harvestDataId>", new RequestContext());
+Response response = client.GetHarvestData("<partyId>", "<harvestDataId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetHarvestData with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetHarvestData("<partyId>", "<harvestDataId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
@@ -161,101 +202,79 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<harvestDataId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<harvestDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    totalYield = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    avgYield = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    totalWetMass = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    avgWetMass = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    avgMoisture = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    avgSpeed = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    harvestProductDetails = new[] {
-        new {
-            productName = "<productName>",
-            area = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalYield = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgYield = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgMoisture = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalWetMass = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgWetMass = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-        }
-    },
-    area = new {
-        unit = "<unit>",
-        value = 123.45d,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["totalYield"] = new Dictionary<string, object>()
+    {
+        ["unit"] = "<unit>",
+        ["value"] = 123.45,
     },
-    operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    associatedBoundaryId = "<associatedBoundaryId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["avgYield"] = null
+,
+    ["totalWetMass"] = null
+,
+    ["avgWetMass"] = null
+,
+    ["avgMoisture"] = null
+,
+    ["avgSpeed"] = null
+,
+    ["harvestProductDetails"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["productName"] = "<productName>",
+["area"] = null
+,
+["totalYield"] = null
+,
+["avgYield"] = null
+,
+["avgMoisture"] = null
+,
+["totalWetMass"] = null
+,
+["avgWetMass"] = null
+,
+}
+},
+    ["area"] = null
+,
+    ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["associatedBoundaryId"] = "<associatedBoundaryId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<harvestDataId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<harvestDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
@@ -301,101 +320,79 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = client.CreateOrUpdate("<partyId>", "<harvestDataId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<harvestDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    totalYield = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    avgYield = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    totalWetMass = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    avgWetMass = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    avgMoisture = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    avgSpeed = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    harvestProductDetails = new[] {
-        new {
-            productName = "<productName>",
-            area = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalYield = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgYield = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgMoisture = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalWetMass = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgWetMass = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-        }
-    },
-    area = new {
-        unit = "<unit>",
-        value = 123.45d,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["totalYield"] = new Dictionary<string, object>()
+    {
+        ["unit"] = "<unit>",
+        ["value"] = 123.45,
     },
-    operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    associatedBoundaryId = "<associatedBoundaryId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["avgYield"] = null
+,
+    ["totalWetMass"] = null
+,
+    ["avgWetMass"] = null
+,
+    ["avgMoisture"] = null
+,
+    ["avgSpeed"] = null
+,
+    ["harvestProductDetails"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["productName"] = "<productName>",
+["area"] = null
+,
+["totalYield"] = null
+,
+["avgYield"] = null
+,
+["avgMoisture"] = null
+,
+["totalWetMass"] = null
+,
+["avgWetMass"] = null
+,
+}
+},
+    ["area"] = null
+,
+    ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["associatedBoundaryId"] = "<associatedBoundaryId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.CreateOrUpdate("<partyId>", "<harvestDataId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<partyId>", "<harvestDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
@@ -441,276 +438,414 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<harvestDataId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<harvestDataId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<harvestDataId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<harvestDataId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetAllHarvestDataAsync(double?,double?,double?,double?,double?,double?,double?,double?,double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllHarvestDataAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllHarvestDataAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetAllHarvestDataAsync(3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<harvestDataIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetAllHarvestDataAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllHarvestDataAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetAllHarvestDataAsync(123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<harvestDataIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllHarvestData(double?,double?,double?,double?,double?,double?,double?,double?,double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllHarvestData with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllHarvestData and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetAllHarvestData(3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<harvestDataIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetAllHarvestData(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllHarvestData with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetAllHarvestData(123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<harvestDataIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllHarvestDataByPartyIdAsync(string,double?,double?,double?,double?,double?,double?,double?,double?,double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllHarvestDataByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllHarvestDataByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetAllHarvestDataByPartyIdAsync("<partyId>", 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetAllHarvestDataByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllHarvestDataByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetAllHarvestDataByPartyIdAsync("<partyId>", 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllHarvestDataByPartyId(string,double?,double?,double?,double?,double?,double?,double?,double?,double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllHarvestDataByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllHarvestDataByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetAllHarvestDataByPartyId("<partyId>", 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetAllHarvestDataByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllHarvestDataByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetAllHarvestDataByPartyId("<partyId>", 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<harvestDataId>", new RequestContext());
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<harvestDataId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<harvestDataId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -724,19 +859,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<harvestDataId>", null);
+BinaryData responseData = operation.Value;
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<harvestDataId>", new RequestContext());
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<harvestDataId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -750,8 +897,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ImageProcessing.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ImageProcessing.xml
index d0bfd8493e8c..bf2816a0b8ad 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ImageProcessing.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ImageProcessing.xml
@@ -2,13 +2,25 @@
 <doc>
   <members>
     <member name="GetRasterizeJobAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetRasterizeJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRasterizeJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetImageProcessingClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetRasterizeJobAsync("<jobId>", new RequestContext());
+Response response = await client.GetRasterizeJobAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("shapefileAttachmentId").ToString());
+Console.WriteLine(result.GetProperty("shapefileColumnNames")[0].ToString());
+]]></code>
+This sample shows how to call GetRasterizeJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetRasterizeJobAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -27,18 +39,29 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetRasterizeJob(string,RequestContext)">
-<example>
-This sample shows how to call GetRasterizeJob with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRasterizeJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetImageProcessingClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetRasterizeJob("<jobId>", new RequestContext());
+Response response = client.GetRasterizeJob("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("shapefileAttachmentId").ToString());
+Console.WriteLine(result.GetProperty("shapefileColumnNames")[0].ToString());
+]]></code>
+This sample shows how to call GetRasterizeJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetRasterizeJob("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -57,54 +80,56 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateRasterizeJobAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateRasterizeJobAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateRasterizeJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetImageProcessingClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    shapefileAttachmentId = "<shapefileAttachmentId>",
-    shapefileColumnNames = new[] {
-        "<String>"
-    },
-};
-
-var operation = await client.CreateRasterizeJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+TokenCredential credential = new DefaultAzureCredential();
+ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["shapefileAttachmentId"] = "<shapefileAttachmentId>",
+    ["shapefileColumnNames"] = new List<object>()
+{
+"<shapefileColumnNames>"
+},
+});
+Operation<BinaryData> operation = await client.CreateRasterizeJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("shapefileAttachmentId").ToString());
 Console.WriteLine(result.GetProperty("shapefileColumnNames")[0].ToString());
 ]]></code>
-This sample shows how to call CreateRasterizeJobAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateRasterizeJobAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetImageProcessingClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    shapefileAttachmentId = "<shapefileAttachmentId>",
-    shapefileColumnNames = new[] {
-        "<String>"
-    },
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["shapefileAttachmentId"] = "<shapefileAttachmentId>",
+    ["shapefileColumnNames"] = new List<object>()
+{
+"<shapefileColumnNames>"
+},
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = await client.CreateRasterizeJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = await client.CreateRasterizeJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("shapefileAttachmentId").ToString());
@@ -122,54 +147,56 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateRasterizeJob(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateRasterizeJob with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateRasterizeJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetImageProcessingClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    shapefileAttachmentId = "<shapefileAttachmentId>",
-    shapefileColumnNames = new[] {
-        "<String>"
-    },
-};
-
-var operation = client.CreateRasterizeJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+TokenCredential credential = new DefaultAzureCredential();
+ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["shapefileAttachmentId"] = "<shapefileAttachmentId>",
+    ["shapefileColumnNames"] = new List<object>()
+{
+"<shapefileColumnNames>"
+},
+});
+Operation<BinaryData> operation = client.CreateRasterizeJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("shapefileAttachmentId").ToString());
 Console.WriteLine(result.GetProperty("shapefileColumnNames")[0].ToString());
 ]]></code>
-This sample shows how to call CreateRasterizeJob with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateRasterizeJob with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetImageProcessingClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    shapefileAttachmentId = "<shapefileAttachmentId>",
-    shapefileColumnNames = new[] {
-        "<String>"
-    },
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["shapefileAttachmentId"] = "<shapefileAttachmentId>",
+    ["shapefileColumnNames"] = new List<object>()
+{
+"<shapefileColumnNames>"
+},
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = client.CreateRasterizeJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = client.CreateRasterizeJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("shapefileAttachmentId").ToString());
@@ -187,9 +214,8 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/InsightAttachments.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/InsightAttachments.xml
index 1471ead8d9ec..945ab1080da5 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/InsightAttachments.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/InsightAttachments.xml
@@ -2,15 +2,25 @@
 <doc>
   <members>
     <member name="CreateOrUpdateAsync(string,string,string,string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-var data = File.OpenRead("<filePath>");
+RequestContent content = RequestContent.Create("<insightId>");
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", content);
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", RequestContent.Create(data));
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("insightId").ToString());
+]]></code>
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("insightId").ToString());
@@ -29,19 +39,28 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,string,string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create("<insightId>");
+Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", content);
 
-var data = File.OpenRead("<filePath>");
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("insightId").ToString());
+]]></code>
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("insightId").ToString());
@@ -60,17 +79,26 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetInsightAttachmentAsync(string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetInsightAttachmentAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetInsightAttachmentAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetInsightAttachmentAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("insightId").ToString());
+]]></code>
+This sample shows how to call GetInsightAttachmentAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetInsightAttachmentAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", new RequestContext());
+Response response = await client.GetInsightAttachmentAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("insightId").ToString());
@@ -89,17 +117,26 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetInsightAttachment(string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetInsightAttachment with required parameters and parse the result.
+      <example>
+This sample shows how to call GetInsightAttachment and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetInsightAttachment("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", new RequestContext());
+Response response = client.GetInsightAttachment("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("insightId").ToString());
+]]></code>
+This sample shows how to call GetInsightAttachment with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetInsightAttachment("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("insightId").ToString());
@@ -118,128 +155,217 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DownloadAsync(string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call DownloadAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DownloadAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.DownloadAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", new RequestContext());
+Response response = await client.DownloadAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
 if (response.ContentStream != null)
 {
-    using(Stream outFileStream = File.OpenWrite("<filePath>"))
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
     {
         response.ContentStream.CopyTo(outFileStream);
     }
 }
 ]]></code>
-</example>
+This sample shows how to call DownloadAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DownloadAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
+if (response.ContentStream != null)
+{
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
+    {
+        response.ContentStream.CopyTo(outFileStream);
+    }
+}
+]]></code></example>
     </member>
     <member name="Download(string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call Download with required parameters and parse the result.
+      <example>
+This sample shows how to call Download and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.Download("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", new RequestContext());
+Response response = client.Download("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
 if (response.ContentStream != null)
 {
-    using(Stream outFileStream = File.OpenWrite("<filePath>"))
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
     {
         response.ContentStream.CopyTo(outFileStream);
     }
 }
 ]]></code>
-</example>
+This sample shows how to call Download with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Download("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
+if (response.ContentStream != null)
+{
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
+    {
+        response.ContentStream.CopyTo(outFileStream);
+    }
+}
+]]></code></example>
     </member>
     <member name="GetInsightAttachmentsByPartyIdModelIdAndResourceAsync(string,string,string,string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetInsightAttachmentsByPartyIdModelIdAndResourceAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetInsightAttachmentsByPartyIdModelIdAndResourceAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetInsightAttachmentsByPartyIdModelIdAndResourceAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", new String[]{"<insightIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetInsightAttachmentsByPartyIdModelIdAndResourceAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("insightId").ToString());
-    Console.WriteLine(result.GetProperty("modelId").ToString());
-    Console.WriteLine(result.GetProperty("resourceType").ToString());
-    Console.WriteLine(result.GetProperty("resourceId").ToString());
-    Console.WriteLine(result.GetProperty("originalFileName").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("insightId").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetInsightAttachmentsByPartyIdModelIdAndResourceAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetInsightAttachmentsByPartyIdModelIdAndResourceAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", new List<string>()
+{
+"<insightIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("insightId").ToString());
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceType").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+    Console.WriteLine(result[0].GetProperty("originalFileName").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetInsightAttachmentsByPartyIdModelIdAndResource(string,string,string,string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetInsightAttachmentsByPartyIdModelIdAndResource with required parameters and parse the result.
+      <example>
+This sample shows how to call GetInsightAttachmentsByPartyIdModelIdAndResource and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetInsightAttachmentsByPartyIdModelIdAndResource("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", new String[]{"<insightIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetInsightAttachmentsByPartyIdModelIdAndResource("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("insightId").ToString());
-    Console.WriteLine(result.GetProperty("modelId").ToString());
-    Console.WriteLine(result.GetProperty("resourceType").ToString());
-    Console.WriteLine(result.GetProperty("resourceId").ToString());
-    Console.WriteLine(result.GetProperty("originalFileName").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("insightId").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetInsightAttachmentsByPartyIdModelIdAndResource with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetInsightAttachmentsByPartyIdModelIdAndResource("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", new List<string>()
+{
+"<insightIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("insightId").ToString());
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceType").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+    Console.WriteLine(result[0].GetProperty("originalFileName").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Insights.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Insights.xml
index b71d2c46cc6e..3137ef3d7046 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Insights.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Insights.xml
@@ -2,13 +2,25 @@
 <doc>
   <members>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -23,17 +35,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -48,47 +71,48 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,string,string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
-
-var data = new {
-    modelVersion = "<modelVersion>",
-    insightStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    insightEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    measurements = new {
-        key = new {
-            unit = "<unit>",
-            value = 123.45d,
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["modelVersion"] = "<modelVersion>",
+    ["insightStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["insightEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["measurements"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["unit"] = "<unit>",
+            ["value"] = 123.45,
         },
     },
-    status = "<status>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["status"] = "<status>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -99,8 +123,8 @@ Console.WriteLine(result.GetProperty("modelVersion").ToString());
 Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
 Console.WriteLine(result.GetProperty("insightStartDateTime").ToString());
 Console.WriteLine(result.GetProperty("insightEndDateTime").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -110,48 +134,49 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,string,string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
-
-var data = new {
-    modelVersion = "<modelVersion>",
-    insightStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    insightEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    measurements = new {
-        key = new {
-            unit = "<unit>",
-            value = 123.45d,
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["modelVersion"] = "<modelVersion>",
+    ["insightStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["insightEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["measurements"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["unit"] = "<unit>",
+            ["value"] = 123.45,
         },
     },
-    status = "<status>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["status"] = "<status>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -162,8 +187,8 @@ Console.WriteLine(result.GetProperty("modelVersion").ToString());
 Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
 Console.WriteLine(result.GetProperty("insightStartDateTime").ToString());
 Console.WriteLine(result.GetProperty("insightEndDateTime").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -173,18 +198,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetInsightAsync(string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetInsightAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetInsightAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetInsightAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetInsightAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetInsightAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", new RequestContext());
+Response response = await client.GetInsightAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -195,8 +229,8 @@ Console.WriteLine(result.GetProperty("modelVersion").ToString());
 Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
 Console.WriteLine(result.GetProperty("insightStartDateTime").ToString());
 Console.WriteLine(result.GetProperty("insightEndDateTime").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -206,18 +240,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetInsight(string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetInsight with required parameters and parse the result.
+      <example>
+This sample shows how to call GetInsight and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetInsight("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", new RequestContext());
+Response response = client.GetInsight("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetInsight with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetInsight("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -228,8 +271,8 @@ Console.WriteLine(result.GetProperty("modelVersion").ToString());
 Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
 Console.WriteLine(result.GetProperty("insightStartDateTime").ToString());
 Console.WriteLine(result.GetProperty("insightEndDateTime").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -239,112 +282,188 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetInsightsByPartyIdModelIdAndResourceAsync(string,string,string,string,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetInsightsByPartyIdModelIdAndResourceAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetInsightsByPartyIdModelIdAndResourceAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetInsightsByPartyIdModelIdAndResourceAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, new String[]{"<measurementFilters>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetInsightsByPartyIdModelIdAndResourceAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("modelId").ToString());
-    Console.WriteLine(result.GetProperty("resourceType").ToString());
-    Console.WriteLine(result.GetProperty("resourceId").ToString());
-    Console.WriteLine(result.GetProperty("modelVersion").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("insightStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("insightEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetInsightsByPartyIdModelIdAndResourceAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetInsightsByPartyIdModelIdAndResourceAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), new List<string>()
+{
+"<measurementFilters>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceType").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+    Console.WriteLine(result[0].GetProperty("modelVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("insightStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("insightEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetInsightsByPartyIdModelIdAndResource(string,string,string,string,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetInsightsByPartyIdModelIdAndResource with required parameters and parse the result.
+      <example>
+This sample shows how to call GetInsightsByPartyIdModelIdAndResource and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetInsightsByPartyIdModelIdAndResource("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, new String[]{"<measurementFilters>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetInsightsByPartyIdModelIdAndResource("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("modelId").ToString());
-    Console.WriteLine(result.GetProperty("resourceType").ToString());
-    Console.WriteLine(result.GetProperty("resourceId").ToString());
-    Console.WriteLine(result.GetProperty("modelVersion").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("insightStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("insightEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetInsightsByPartyIdModelIdAndResource with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetInsightsByPartyIdModelIdAndResource("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), new List<string>()
+{
+"<measurementFilters>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceType").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+    Console.WriteLine(result[0].GetProperty("modelVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("insightStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("insightEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", new RequestContext());
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -358,19 +477,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", new RequestContext());
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -384,8 +515,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ManagementZones.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ManagementZones.xml
index 2dda16f0612b..f4fc26aefaa5 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ManagementZones.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ManagementZones.xml
@@ -2,13 +2,25 @@
 <doc>
   <members>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -23,17 +35,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -48,17 +71,26 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetManagementZoneAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetManagementZoneAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetManagementZoneAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetManagementZoneAsync("<partyId>", "<managementZoneId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetManagementZoneAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetManagementZoneAsync("<partyId>", "<managementZoneId>", new RequestContext());
+Response response = await client.GetManagementZoneAsync("<partyId>", "<managementZoneId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -76,18 +108,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetManagementZone(string,string,RequestContext)">
-<example>
-This sample shows how to call GetManagementZone with required parameters and parse the result.
+      <example>
+This sample shows how to call GetManagementZone and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetManagementZone("<partyId>", "<managementZoneId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetManagementZone with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetManagementZone("<partyId>", "<managementZoneId>", new RequestContext());
+Response response = client.GetManagementZone("<partyId>", "<managementZoneId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -105,44 +146,43 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<managementZoneId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<managementZoneId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
-
-var data = new {
-    type = "<type>",
-    seasonId = "<seasonId>",
-    cropId = "<cropId>",
-    fieldId = "<fieldId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<managementZoneId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["type"] = "<type>",
+    ["seasonId"] = "<seasonId>",
+    ["cropId"] = "<cropId>",
+    ["fieldId"] = "<fieldId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<managementZoneId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -160,44 +200,43 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<managementZoneId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<managementZoneId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
-
-var data = new {
-    type = "<type>",
-    seasonId = "<seasonId>",
-    cropId = "<cropId>",
-    fieldId = "<fieldId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<managementZoneId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["type"] = "<type>",
+    ["seasonId"] = "<seasonId>",
+    ["cropId"] = "<cropId>",
+    ["fieldId"] = "<fieldId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = client.CreateOrUpdate("<partyId>", "<managementZoneId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -215,164 +254,338 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<managementZoneId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<managementZoneId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<managementZoneId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<managementZoneId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetManagementZonesAsync(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetManagementZonesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetManagementZonesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetManagementZonesAsync(new String[]{"<types>"}, new String[]{"<cropIds>"}, new String[]{"<seasonIds>"}, new String[]{"<fieldIds>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetManagementZonesAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetManagementZonesAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetManagementZonesAsync(new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetManagementZones(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetManagementZones with required parameters and parse the result.
+      <example>
+This sample shows how to call GetManagementZones and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetManagementZones(new String[]{"<types>"}, new String[]{"<cropIds>"}, new String[]{"<seasonIds>"}, new String[]{"<fieldIds>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetManagementZones(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetManagementZones with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetManagementZones(new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetManagementZonesByPartyIdAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetManagementZonesByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetManagementZonesByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetManagementZonesByPartyIdAsync("<partyId>", new String[]{"<types>"}, new String[]{"<cropIds>"}, new String[]{"<seasonIds>"}, new String[]{"<fieldIds>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetManagementZonesByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetManagementZonesByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetManagementZonesByPartyIdAsync("<partyId>", new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetManagementZonesByPartyId(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetManagementZonesByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetManagementZonesByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetManagementZonesByPartyId("<partyId>", new String[]{"<types>"}, new String[]{"<cropIds>"}, new String[]{"<seasonIds>"}, new String[]{"<fieldIds>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetManagementZonesByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetManagementZonesByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetManagementZonesByPartyId("<partyId>", new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<managementZoneId>", new RequestContext());
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<managementZoneId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<managementZoneId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -386,19 +599,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<managementZoneId>", new RequestContext());
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<managementZoneId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<managementZoneId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -412,8 +637,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ModelInference.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ModelInference.xml
index d0fd140dd157..ad007e6e0e9e 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ModelInference.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/ModelInference.xml
@@ -2,13 +2,33 @@
 <doc>
   <members>
     <member name="GetBiomassModelJobAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetBiomassModelJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBiomassModelJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetBiomassModelJobAsync("<jobId>", new RequestContext());
+Response response = await client.GetBiomassModelJobAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("boundaryId").ToString());
+Console.WriteLine(result.GetProperty("modelVersion").ToString());
+Console.WriteLine(result.GetProperty("cropName").ToString());
+Console.WriteLine(result.GetProperty("plantingStartDateTime").ToString());
+Console.WriteLine(result.GetProperty("inferenceEndDateTime").ToString());
+Console.WriteLine(result.GetProperty("weatherExtensionId").ToString());
+Console.WriteLine(result.GetProperty("satelliteProvider").ToString());
+Console.WriteLine(result.GetProperty("satelliteSource").ToString());
+Console.WriteLine(result.GetProperty("imageResolution").ToString());
+Console.WriteLine(result.GetProperty("imageFormat").ToString());
+]]></code>
+This sample shows how to call GetBiomassModelJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetBiomassModelJobAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -35,18 +55,37 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetBiomassModelJob(string,RequestContext)">
-<example>
-This sample shows how to call GetBiomassModelJob with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBiomassModelJob and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetBiomassModelJob("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("boundaryId").ToString());
+Console.WriteLine(result.GetProperty("modelVersion").ToString());
+Console.WriteLine(result.GetProperty("cropName").ToString());
+Console.WriteLine(result.GetProperty("plantingStartDateTime").ToString());
+Console.WriteLine(result.GetProperty("inferenceEndDateTime").ToString());
+Console.WriteLine(result.GetProperty("weatherExtensionId").ToString());
+Console.WriteLine(result.GetProperty("satelliteProvider").ToString());
+Console.WriteLine(result.GetProperty("satelliteSource").ToString());
+Console.WriteLine(result.GetProperty("imageResolution").ToString());
+Console.WriteLine(result.GetProperty("imageFormat").ToString());
+]]></code>
+This sample shows how to call GetBiomassModelJob with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetBiomassModelJob("<jobId>", new RequestContext());
+Response response = client.GetBiomassModelJob("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -73,18 +112,35 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSensorPlacementModelJobAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetSensorPlacementModelJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorPlacementModelJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetSensorPlacementModelJobAsync("<jobId>", new RequestContext());
+Response response = await client.GetSensorPlacementModelJobAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("boundaryId").ToString());
+Console.WriteLine(result.GetProperty("modelVersion").ToString());
+Console.WriteLine(result.GetProperty("inferenceStartDateTime").ToString());
+Console.WriteLine(result.GetProperty("inferenceEndDateTime").ToString());
+Console.WriteLine(result.GetProperty("satelliteProvider").ToString());
+Console.WriteLine(result.GetProperty("satelliteSource").ToString());
+Console.WriteLine(result.GetProperty("sensorType").ToString());
+Console.WriteLine(result.GetProperty("isRanked").ToString());
+]]></code>
+This sample shows how to call GetSensorPlacementModelJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetSensorPlacementModelJobAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -109,18 +165,35 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSensorPlacementModelJob(string,RequestContext)">
-<example>
-This sample shows how to call GetSensorPlacementModelJob with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorPlacementModelJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetSensorPlacementModelJob("<jobId>", new RequestContext());
+Response response = client.GetSensorPlacementModelJob("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("boundaryId").ToString());
+Console.WriteLine(result.GetProperty("modelVersion").ToString());
+Console.WriteLine(result.GetProperty("inferenceStartDateTime").ToString());
+Console.WriteLine(result.GetProperty("inferenceEndDateTime").ToString());
+Console.WriteLine(result.GetProperty("satelliteProvider").ToString());
+Console.WriteLine(result.GetProperty("satelliteSource").ToString());
+Console.WriteLine(result.GetProperty("sensorType").ToString());
+Console.WriteLine(result.GetProperty("isRanked").ToString());
+]]></code>
+This sample shows how to call GetSensorPlacementModelJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetSensorPlacementModelJob("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -145,18 +218,40 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSoilMoistureModelJobAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetSoilMoistureModelJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSoilMoistureModelJobAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetSoilMoistureModelJobAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("boundaryId").ToString());
+Console.WriteLine(result.GetProperty("sensorDataModelId").ToString());
+Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
+Console.WriteLine(result.GetProperty("inferenceStartDateTime").ToString());
+Console.WriteLine(result.GetProperty("inferenceEndDateTime").ToString());
+Console.WriteLine(result.GetProperty("satelliteProvider").ToString());
+Console.WriteLine(result.GetProperty("satelliteSource").ToString());
+Console.WriteLine(result.GetProperty("imageResolution").ToString());
+Console.WriteLine(result.GetProperty("imageFormat").ToString());
+Console.WriteLine(result.GetProperty("modelVersion").ToString());
+Console.WriteLine(result.GetProperty("sensorDefinition").GetProperty("sensorMeasurement").ToString());
+Console.WriteLine(result.GetProperty("sensorDefinition").GetProperty("minProperty").ToString());
+Console.WriteLine(result.GetProperty("sensorDefinition").GetProperty("maxProperty").ToString());
+]]></code>
+This sample shows how to call GetSoilMoistureModelJobAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetSoilMoistureModelJobAsync("<jobId>", new RequestContext());
+Response response = await client.GetSoilMoistureModelJobAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -186,18 +281,40 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSoilMoistureModelJob(string,RequestContext)">
-<example>
-This sample shows how to call GetSoilMoistureModelJob with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSoilMoistureModelJob and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetSoilMoistureModelJob("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("boundaryId").ToString());
+Console.WriteLine(result.GetProperty("sensorDataModelId").ToString());
+Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
+Console.WriteLine(result.GetProperty("inferenceStartDateTime").ToString());
+Console.WriteLine(result.GetProperty("inferenceEndDateTime").ToString());
+Console.WriteLine(result.GetProperty("satelliteProvider").ToString());
+Console.WriteLine(result.GetProperty("satelliteSource").ToString());
+Console.WriteLine(result.GetProperty("imageResolution").ToString());
+Console.WriteLine(result.GetProperty("imageFormat").ToString());
+Console.WriteLine(result.GetProperty("modelVersion").ToString());
+Console.WriteLine(result.GetProperty("sensorDefinition").GetProperty("sensorMeasurement").ToString());
+Console.WriteLine(result.GetProperty("sensorDefinition").GetProperty("minProperty").ToString());
+Console.WriteLine(result.GetProperty("sensorDefinition").GetProperty("maxProperty").ToString());
+]]></code>
+This sample shows how to call GetSoilMoistureModelJob with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetSoilMoistureModelJob("<jobId>", new RequestContext());
+Response response = client.GetSoilMoistureModelJob("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -227,34 +344,33 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateBiomassModelJobAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateBiomassModelJobAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateBiomassModelJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    modelVersion = "<modelVersion>",
-    cropName = "Corn",
-    plantingStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    weatherExtensionId = "<weatherExtensionId>",
-    satelliteProvider = "Microsoft",
-    satelliteSource = "Sentinel_2_L2A",
-    imageResolution = 123.45d,
-    imageFormat = "TIF",
-};
-
-var operation = await client.CreateBiomassModelJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["modelVersion"] = "<modelVersion>",
+    ["cropName"] = "Corn",
+    ["plantingStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["weatherExtensionId"] = "<weatherExtensionId>",
+    ["satelliteProvider"] = "Microsoft",
+    ["satelliteSource"] = "Sentinel_2_L2A",
+    ["imageResolution"] = 123.45,
+    ["imageFormat"] = "TIF",
+});
+Operation<BinaryData> operation = await client.CreateBiomassModelJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -268,33 +384,34 @@ Console.WriteLine(result.GetProperty("satelliteSource").ToString());
 Console.WriteLine(result.GetProperty("imageResolution").ToString());
 Console.WriteLine(result.GetProperty("imageFormat").ToString());
 ]]></code>
-This sample shows how to call CreateBiomassModelJobAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateBiomassModelJobAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    modelVersion = "<modelVersion>",
-    cropName = "Corn",
-    plantingStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    weatherExtensionId = "<weatherExtensionId>",
-    satelliteProvider = "Microsoft",
-    satelliteSource = "Sentinel_2_L2A",
-    imageResolution = 123.45d,
-    imageFormat = "TIF",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["modelVersion"] = "<modelVersion>",
+    ["cropName"] = "Corn",
+    ["plantingStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["weatherExtensionId"] = "<weatherExtensionId>",
+    ["satelliteProvider"] = "Microsoft",
+    ["satelliteSource"] = "Sentinel_2_L2A",
+    ["imageResolution"] = 123.45,
+    ["imageFormat"] = "TIF",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = await client.CreateBiomassModelJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = await client.CreateBiomassModelJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -320,34 +437,33 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateBiomassModelJob(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateBiomassModelJob with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateBiomassModelJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    modelVersion = "<modelVersion>",
-    cropName = "Corn",
-    plantingStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    weatherExtensionId = "<weatherExtensionId>",
-    satelliteProvider = "Microsoft",
-    satelliteSource = "Sentinel_2_L2A",
-    imageResolution = 123.45d,
-    imageFormat = "TIF",
-};
-
-var operation = client.CreateBiomassModelJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["modelVersion"] = "<modelVersion>",
+    ["cropName"] = "Corn",
+    ["plantingStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["weatherExtensionId"] = "<weatherExtensionId>",
+    ["satelliteProvider"] = "Microsoft",
+    ["satelliteSource"] = "Sentinel_2_L2A",
+    ["imageResolution"] = 123.45,
+    ["imageFormat"] = "TIF",
+});
+Operation<BinaryData> operation = client.CreateBiomassModelJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -361,33 +477,34 @@ Console.WriteLine(result.GetProperty("satelliteSource").ToString());
 Console.WriteLine(result.GetProperty("imageResolution").ToString());
 Console.WriteLine(result.GetProperty("imageFormat").ToString());
 ]]></code>
-This sample shows how to call CreateBiomassModelJob with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateBiomassModelJob with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    modelVersion = "<modelVersion>",
-    cropName = "Corn",
-    plantingStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    weatherExtensionId = "<weatherExtensionId>",
-    satelliteProvider = "Microsoft",
-    satelliteSource = "Sentinel_2_L2A",
-    imageResolution = 123.45d,
-    imageFormat = "TIF",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["modelVersion"] = "<modelVersion>",
+    ["cropName"] = "Corn",
+    ["plantingStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["weatherExtensionId"] = "<weatherExtensionId>",
+    ["satelliteProvider"] = "Microsoft",
+    ["satelliteSource"] = "Sentinel_2_L2A",
+    ["imageResolution"] = 123.45,
+    ["imageFormat"] = "TIF",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = client.CreateBiomassModelJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = client.CreateBiomassModelJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -413,32 +530,31 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateSensorPlacementModelJobAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateSensorPlacementModelJobAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateSensorPlacementModelJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    modelVersion = "<modelVersion>",
-    inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    satelliteProvider = "Microsoft",
-    satelliteSource = "Sentinel_2_L2A",
-    sensorType = "<sensorType>",
-    isRanked = true,
-};
-
-var operation = await client.CreateSensorPlacementModelJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["modelVersion"] = "<modelVersion>",
+    ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["satelliteProvider"] = "Microsoft",
+    ["satelliteSource"] = "Sentinel_2_L2A",
+    ["sensorType"] = "<sensorType>",
+    ["isRanked"] = true,
+});
+Operation<BinaryData> operation = await client.CreateSensorPlacementModelJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -450,31 +566,32 @@ Console.WriteLine(result.GetProperty("satelliteSource").ToString());
 Console.WriteLine(result.GetProperty("sensorType").ToString());
 Console.WriteLine(result.GetProperty("isRanked").ToString());
 ]]></code>
-This sample shows how to call CreateSensorPlacementModelJobAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateSensorPlacementModelJobAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    modelVersion = "<modelVersion>",
-    inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    satelliteProvider = "Microsoft",
-    satelliteSource = "Sentinel_2_L2A",
-    sensorType = "<sensorType>",
-    isRanked = true,
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["modelVersion"] = "<modelVersion>",
+    ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["satelliteProvider"] = "Microsoft",
+    ["satelliteSource"] = "Sentinel_2_L2A",
+    ["sensorType"] = "<sensorType>",
+    ["isRanked"] = true,
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = await client.CreateSensorPlacementModelJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = await client.CreateSensorPlacementModelJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -498,32 +615,31 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateSensorPlacementModelJob(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateSensorPlacementModelJob with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateSensorPlacementModelJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    modelVersion = "<modelVersion>",
-    inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    satelliteProvider = "Microsoft",
-    satelliteSource = "Sentinel_2_L2A",
-    sensorType = "<sensorType>",
-    isRanked = true,
-};
-
-var operation = client.CreateSensorPlacementModelJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["modelVersion"] = "<modelVersion>",
+    ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["satelliteProvider"] = "Microsoft",
+    ["satelliteSource"] = "Sentinel_2_L2A",
+    ["sensorType"] = "<sensorType>",
+    ["isRanked"] = true,
+});
+Operation<BinaryData> operation = client.CreateSensorPlacementModelJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -535,31 +651,32 @@ Console.WriteLine(result.GetProperty("satelliteSource").ToString());
 Console.WriteLine(result.GetProperty("sensorType").ToString());
 Console.WriteLine(result.GetProperty("isRanked").ToString());
 ]]></code>
-This sample shows how to call CreateSensorPlacementModelJob with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateSensorPlacementModelJob with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    modelVersion = "<modelVersion>",
-    inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    satelliteProvider = "Microsoft",
-    satelliteSource = "Sentinel_2_L2A",
-    sensorType = "<sensorType>",
-    isRanked = true,
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["modelVersion"] = "<modelVersion>",
+    ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["satelliteProvider"] = "Microsoft",
+    ["satelliteSource"] = "Sentinel_2_L2A",
+    ["sensorType"] = "<sensorType>",
+    ["isRanked"] = true,
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = client.CreateSensorPlacementModelJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = client.CreateSensorPlacementModelJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -583,39 +700,39 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateSoilMoistureModelJobAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateSoilMoistureModelJobAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateSoilMoistureModelJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    sensorDataModelId = "<sensorDataModelId>",
-    sensorPartnerId = "<sensorPartnerId>",
-    inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    satelliteProvider = "Microsoft",
-    satelliteSource = "Sentinel_2_L2A",
-    imageResolution = 123.45d,
-    imageFormat = "TIF",
-    modelVersion = "<modelVersion>",
-    sensorDefinition = new {
-        sensorMeasurement = "<sensorMeasurement>",
-        minProperty = "<minProperty>",
-        maxProperty = "<maxProperty>",
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["sensorDataModelId"] = "<sensorDataModelId>",
+    ["sensorPartnerId"] = "<sensorPartnerId>",
+    ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["satelliteProvider"] = "Microsoft",
+    ["satelliteSource"] = "Sentinel_2_L2A",
+    ["imageResolution"] = 123.45,
+    ["imageFormat"] = "TIF",
+    ["modelVersion"] = "<modelVersion>",
+    ["sensorDefinition"] = new Dictionary<string, object>()
+    {
+        ["sensorMeasurement"] = "<sensorMeasurement>",
+        ["minProperty"] = "<minProperty>",
+        ["maxProperty"] = "<maxProperty>",
     },
-};
-
-var operation = await client.CreateSoilMoistureModelJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = await client.CreateSoilMoistureModelJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -632,38 +749,40 @@ Console.WriteLine(result.GetProperty("sensorDefinition").GetProperty("sensorMeas
 Console.WriteLine(result.GetProperty("sensorDefinition").GetProperty("minProperty").ToString());
 Console.WriteLine(result.GetProperty("sensorDefinition").GetProperty("maxProperty").ToString());
 ]]></code>
-This sample shows how to call CreateSoilMoistureModelJobAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateSoilMoistureModelJobAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    sensorDataModelId = "<sensorDataModelId>",
-    sensorPartnerId = "<sensorPartnerId>",
-    inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    satelliteProvider = "Microsoft",
-    satelliteSource = "Sentinel_2_L2A",
-    imageResolution = 123.45d,
-    imageFormat = "TIF",
-    modelVersion = "<modelVersion>",
-    sensorDefinition = new {
-        sensorMeasurement = "<sensorMeasurement>",
-        minProperty = "<minProperty>",
-        maxProperty = "<maxProperty>",
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["sensorDataModelId"] = "<sensorDataModelId>",
+    ["sensorPartnerId"] = "<sensorPartnerId>",
+    ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["satelliteProvider"] = "Microsoft",
+    ["satelliteSource"] = "Sentinel_2_L2A",
+    ["imageResolution"] = 123.45,
+    ["imageFormat"] = "TIF",
+    ["modelVersion"] = "<modelVersion>",
+    ["sensorDefinition"] = new Dictionary<string, object>()
+    {
+        ["sensorMeasurement"] = "<sensorMeasurement>",
+        ["minProperty"] = "<minProperty>",
+        ["maxProperty"] = "<maxProperty>",
     },
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = await client.CreateSoilMoistureModelJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = await client.CreateSoilMoistureModelJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -692,39 +811,39 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateSoilMoistureModelJob(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateSoilMoistureModelJob with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateSoilMoistureModelJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    sensorDataModelId = "<sensorDataModelId>",
-    sensorPartnerId = "<sensorPartnerId>",
-    inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    satelliteProvider = "Microsoft",
-    satelliteSource = "Sentinel_2_L2A",
-    imageResolution = 123.45d,
-    imageFormat = "TIF",
-    modelVersion = "<modelVersion>",
-    sensorDefinition = new {
-        sensorMeasurement = "<sensorMeasurement>",
-        minProperty = "<minProperty>",
-        maxProperty = "<maxProperty>",
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["sensorDataModelId"] = "<sensorDataModelId>",
+    ["sensorPartnerId"] = "<sensorPartnerId>",
+    ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["satelliteProvider"] = "Microsoft",
+    ["satelliteSource"] = "Sentinel_2_L2A",
+    ["imageResolution"] = 123.45,
+    ["imageFormat"] = "TIF",
+    ["modelVersion"] = "<modelVersion>",
+    ["sensorDefinition"] = new Dictionary<string, object>()
+    {
+        ["sensorMeasurement"] = "<sensorMeasurement>",
+        ["minProperty"] = "<minProperty>",
+        ["maxProperty"] = "<maxProperty>",
     },
-};
-
-var operation = client.CreateSoilMoistureModelJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = client.CreateSoilMoistureModelJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -741,38 +860,40 @@ Console.WriteLine(result.GetProperty("sensorDefinition").GetProperty("sensorMeas
 Console.WriteLine(result.GetProperty("sensorDefinition").GetProperty("minProperty").ToString());
 Console.WriteLine(result.GetProperty("sensorDefinition").GetProperty("maxProperty").ToString());
 ]]></code>
-This sample shows how to call CreateSoilMoistureModelJob with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateSoilMoistureModelJob with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    sensorDataModelId = "<sensorDataModelId>",
-    sensorPartnerId = "<sensorPartnerId>",
-    inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    satelliteProvider = "Microsoft",
-    satelliteSource = "Sentinel_2_L2A",
-    imageResolution = 123.45d,
-    imageFormat = "TIF",
-    modelVersion = "<modelVersion>",
-    sensorDefinition = new {
-        sensorMeasurement = "<sensorMeasurement>",
-        minProperty = "<minProperty>",
-        maxProperty = "<maxProperty>",
+TokenCredential credential = new DefaultAzureCredential();
+ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["sensorDataModelId"] = "<sensorDataModelId>",
+    ["sensorPartnerId"] = "<sensorPartnerId>",
+    ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["satelliteProvider"] = "Microsoft",
+    ["satelliteSource"] = "Sentinel_2_L2A",
+    ["imageResolution"] = 123.45,
+    ["imageFormat"] = "TIF",
+    ["modelVersion"] = "<modelVersion>",
+    ["sensorDefinition"] = new Dictionary<string, object>()
+    {
+        ["sensorMeasurement"] = "<sensorMeasurement>",
+        ["minProperty"] = "<minProperty>",
+        ["maxProperty"] = "<maxProperty>",
     },
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = client.CreateSoilMoistureModelJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = client.CreateSoilMoistureModelJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -801,9 +922,8 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/NutrientAnalyses.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/NutrientAnalyses.xml
index 54886a2570e9..f1072cf18c1b 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/NutrientAnalyses.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/NutrientAnalyses.xml
@@ -2,13 +2,23 @@
 <doc>
   <members>
     <member name="GetNutrientAnalysisAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetNutrientAnalysisAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetNutrientAnalysisAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetNutrientAnalysisAsync("<partyId>", "<nutrientAnalysisId>", new RequestContext());
+Response response = await client.GetNutrientAnalysisAsync("<partyId>", "<nutrientAnalysisId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetNutrientAnalysisAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetNutrientAnalysisAsync("<partyId>", "<nutrientAnalysisId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -33,18 +43,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetNutrientAnalysis(string,string,RequestContext)">
-<example>
-This sample shows how to call GetNutrientAnalysis with required parameters and parse the result.
+      <example>
+This sample shows how to call GetNutrientAnalysis and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetNutrientAnalysis("<partyId>", "<nutrientAnalysisId>", new RequestContext());
+Response response = client.GetNutrientAnalysis("<partyId>", "<nutrientAnalysisId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetNutrientAnalysis with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetNutrientAnalysis("<partyId>", "<nutrientAnalysisId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -69,55 +88,56 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<nutrientAnalysisId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<nutrientAnalysisId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    parentId = "<parentId>",
-    parentType = "PlantTissueAnalysis",
-    unit = "<unit>",
-    value = 123.45d,
-    referenceValueLow = 123.45d,
-    referenceValueHigh = 123.45d,
-    classification = "<classification>",
-    recommendation = "<recommendation>",
-    products = new[] {
-        new {
-            rate = "<rate>",
-            instruction = "<instruction>",
-            product = "<product>",
-        }
-    },
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["parentId"] = "<parentId>",
+    ["parentType"] = "PlantTissueAnalysis",
+    ["unit"] = "<unit>",
+    ["value"] = 123.45,
+    ["referenceValueLow"] = 123.45,
+    ["referenceValueHigh"] = 123.45,
+    ["classification"] = "<classification>",
+    ["recommendation"] = "<recommendation>",
+    ["products"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["rate"] = "<rate>",
+["instruction"] = "<instruction>",
+["product"] = "<product>",
+}
+},
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<nutrientAnalysisId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<nutrientAnalysisId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -142,55 +162,56 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<nutrientAnalysisId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<nutrientAnalysisId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    parentId = "<parentId>",
-    parentType = "PlantTissueAnalysis",
-    unit = "<unit>",
-    value = 123.45d,
-    referenceValueLow = 123.45d,
-    referenceValueHigh = 123.45d,
-    classification = "<classification>",
-    recommendation = "<recommendation>",
-    products = new[] {
-        new {
-            rate = "<rate>",
-            instruction = "<instruction>",
-            product = "<product>",
-        }
-    },
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["parentId"] = "<parentId>",
+    ["parentType"] = "PlantTissueAnalysis",
+    ["unit"] = "<unit>",
+    ["value"] = 123.45,
+    ["referenceValueLow"] = 123.45,
+    ["referenceValueHigh"] = 123.45,
+    ["classification"] = "<classification>",
+    ["recommendation"] = "<recommendation>",
+    ["products"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["rate"] = "<rate>",
+["instruction"] = "<instruction>",
+["product"] = "<product>",
+}
+},
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.CreateOrUpdate("<partyId>", "<nutrientAnalysisId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<partyId>", "<nutrientAnalysisId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -215,181 +236,306 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<nutrientAnalysisId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<nutrientAnalysisId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<nutrientAnalysisId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<nutrientAnalysisId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetNutrientAnalysesAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetNutrientAnalysesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetNutrientAnalysesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetNutrientAnalysesAsync("<parentType>", new String[]{"<parentIds>"}, new String[]{"<classifications>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetNutrientAnalysesAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("parentType").ToString());
-    Console.WriteLine(result.GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("referenceValueLow").ToString());
-    Console.WriteLine(result.GetProperty("referenceValueHigh").ToString());
-    Console.WriteLine(result.GetProperty("classification").ToString());
-    Console.WriteLine(result.GetProperty("recommendation").ToString());
-    Console.WriteLine(result.GetProperty("products")[0].GetProperty("rate").ToString());
-    Console.WriteLine(result.GetProperty("products")[0].GetProperty("instruction").ToString());
-    Console.WriteLine(result.GetProperty("products")[0].GetProperty("product").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetNutrientAnalysesAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetNutrientAnalysesAsync("<parentType>", new List<string>()
+{
+"<parentIds>"
+}, new List<string>()
+{
+"<classifications>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentType").ToString());
+    Console.WriteLine(result[0].GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("referenceValueLow").ToString());
+    Console.WriteLine(result[0].GetProperty("referenceValueHigh").ToString());
+    Console.WriteLine(result[0].GetProperty("classification").ToString());
+    Console.WriteLine(result[0].GetProperty("recommendation").ToString());
+    Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("rate").ToString());
+    Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("instruction").ToString());
+    Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("product").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetNutrientAnalyses(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetNutrientAnalyses with required parameters and parse the result.
+      <example>
+This sample shows how to call GetNutrientAnalyses and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetNutrientAnalyses("<parentType>", new String[]{"<parentIds>"}, new String[]{"<classifications>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetNutrientAnalyses(null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("parentType").ToString());
-    Console.WriteLine(result.GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("referenceValueLow").ToString());
-    Console.WriteLine(result.GetProperty("referenceValueHigh").ToString());
-    Console.WriteLine(result.GetProperty("classification").ToString());
-    Console.WriteLine(result.GetProperty("recommendation").ToString());
-    Console.WriteLine(result.GetProperty("products")[0].GetProperty("rate").ToString());
-    Console.WriteLine(result.GetProperty("products")[0].GetProperty("instruction").ToString());
-    Console.WriteLine(result.GetProperty("products")[0].GetProperty("product").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetNutrientAnalyses with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetNutrientAnalyses("<parentType>", new List<string>()
+{
+"<parentIds>"
+}, new List<string>()
+{
+"<classifications>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentType").ToString());
+    Console.WriteLine(result[0].GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("referenceValueLow").ToString());
+    Console.WriteLine(result[0].GetProperty("referenceValueHigh").ToString());
+    Console.WriteLine(result[0].GetProperty("classification").ToString());
+    Console.WriteLine(result[0].GetProperty("recommendation").ToString());
+    Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("rate").ToString());
+    Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("instruction").ToString());
+    Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("product").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetNutrientAnalysesByPartyIdAsync(string,string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetNutrientAnalysesByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetNutrientAnalysesByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetNutrientAnalysesByPartyIdAsync("<partyId>", "<parentType>", new String[]{"<parentIds>"}, new String[]{"<classifications>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetNutrientAnalysesByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("parentType").ToString());
-    Console.WriteLine(result.GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("referenceValueLow").ToString());
-    Console.WriteLine(result.GetProperty("referenceValueHigh").ToString());
-    Console.WriteLine(result.GetProperty("classification").ToString());
-    Console.WriteLine(result.GetProperty("recommendation").ToString());
-    Console.WriteLine(result.GetProperty("products")[0].GetProperty("rate").ToString());
-    Console.WriteLine(result.GetProperty("products")[0].GetProperty("instruction").ToString());
-    Console.WriteLine(result.GetProperty("products")[0].GetProperty("product").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetNutrientAnalysesByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetNutrientAnalysesByPartyIdAsync("<partyId>", "<parentType>", new List<string>()
+{
+"<parentIds>"
+}, new List<string>()
+{
+"<classifications>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentType").ToString());
+    Console.WriteLine(result[0].GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("referenceValueLow").ToString());
+    Console.WriteLine(result[0].GetProperty("referenceValueHigh").ToString());
+    Console.WriteLine(result[0].GetProperty("classification").ToString());
+    Console.WriteLine(result[0].GetProperty("recommendation").ToString());
+    Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("rate").ToString());
+    Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("instruction").ToString());
+    Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("product").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetNutrientAnalysesByPartyId(string,string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetNutrientAnalysesByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetNutrientAnalysesByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetNutrientAnalysesByPartyId("<partyId>", "<parentType>", new String[]{"<parentIds>"}, new String[]{"<classifications>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetNutrientAnalysesByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("parentType").ToString());
-    Console.WriteLine(result.GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("referenceValueLow").ToString());
-    Console.WriteLine(result.GetProperty("referenceValueHigh").ToString());
-    Console.WriteLine(result.GetProperty("classification").ToString());
-    Console.WriteLine(result.GetProperty("recommendation").ToString());
-    Console.WriteLine(result.GetProperty("products")[0].GetProperty("rate").ToString());
-    Console.WriteLine(result.GetProperty("products")[0].GetProperty("instruction").ToString());
-    Console.WriteLine(result.GetProperty("products")[0].GetProperty("product").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetNutrientAnalysesByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetNutrientAnalysesByPartyId("<partyId>", "<parentType>", new List<string>()
+{
+"<parentIds>"
+}, new List<string>()
+{
+"<classifications>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("parentType").ToString());
+    Console.WriteLine(result[0].GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("referenceValueLow").ToString());
+    Console.WriteLine(result[0].GetProperty("referenceValueHigh").ToString());
+    Console.WriteLine(result[0].GetProperty("classification").ToString());
+    Console.WriteLine(result[0].GetProperty("recommendation").ToString());
+    Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("rate").ToString());
+    Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("instruction").ToString());
+    Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("product").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/OAuthProviders.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/OAuthProviders.xml
index 1d3e2259406c..5f83a3923716 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/OAuthProviders.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/OAuthProviders.xml
@@ -2,13 +2,23 @@
 <doc>
   <members>
     <member name="GetOAuthProviderAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetOAuthProviderAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetOAuthProviderAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetOAuthProviderAsync("<oauthProviderId>", new RequestContext());
+Response response = await client.GetOAuthProviderAsync("<oauthProviderId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetOAuthProviderAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetOAuthProviderAsync("<oauthProviderId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("appId").ToString());
@@ -23,18 +33,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetOAuthProvider(string,RequestContext)">
-<example>
-This sample shows how to call GetOAuthProvider with required parameters and parse the result.
+      <example>
+This sample shows how to call GetOAuthProvider and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetOAuthProvider("<oauthProviderId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetOAuthProvider with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetOAuthProvider("<oauthProviderId>", new RequestContext());
+Response response = client.GetOAuthProvider("<oauthProviderId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("appId").ToString());
@@ -49,42 +68,41 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<oauthProviderId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<oauthProviderId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
-
-var data = new {
-    appId = "<appId>",
-    appSecret = "<appSecret>",
-    apiKey = "<apiKey>",
-    isProductionApp = true,
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<oauthProviderId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["appId"] = "<appId>",
+    ["appSecret"] = "<appSecret>",
+    ["apiKey"] = "<apiKey>",
+    ["isProductionApp"] = true,
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = await client.CreateOrUpdateAsync("<oauthProviderId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("appId").ToString());
@@ -99,42 +117,41 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<oauthProviderId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<oauthProviderId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
-
-var data = new {
-    appId = "<appId>",
-    appSecret = "<appSecret>",
-    apiKey = "<apiKey>",
-    isProductionApp = true,
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<oauthProviderId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["appId"] = "<appId>",
+    ["appSecret"] = "<appSecret>",
+    ["apiKey"] = "<apiKey>",
+    ["isProductionApp"] = true,
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = client.CreateOrUpdate("<oauthProviderId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("appId").ToString());
@@ -149,42 +166,65 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<oauthProviderId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<oauthProviderId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<oauthProviderId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<oauthProviderId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
@@ -201,18 +241,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
@@ -229,74 +278,128 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetOAuthProvidersAsync(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetOAuthProvidersAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetOAuthProvidersAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetOAuthProvidersAsync(new String[]{"<providerIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetOAuthProvidersAsync(null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("appId").ToString());
-    Console.WriteLine(result.GetProperty("appSecret").ToString());
-    Console.WriteLine(result.GetProperty("apiKey").ToString());
-    Console.WriteLine(result.GetProperty("isProductionApp").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetOAuthProvidersAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetOAuthProvidersAsync(new List<string>()
+{
+"<providerIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("appId").ToString());
+    Console.WriteLine(result[0].GetProperty("appSecret").ToString());
+    Console.WriteLine(result[0].GetProperty("apiKey").ToString());
+    Console.WriteLine(result[0].GetProperty("isProductionApp").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetOAuthProviders(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetOAuthProviders with required parameters and parse the result.
+      <example>
+This sample shows how to call GetOAuthProviders and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetOAuthProviders(new String[]{"<providerIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetOAuthProviders(null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("appId").ToString());
-    Console.WriteLine(result.GetProperty("appSecret").ToString());
-    Console.WriteLine(result.GetProperty("apiKey").ToString());
-    Console.WriteLine(result.GetProperty("isProductionApp").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetOAuthProviders with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetOAuthProviders(new List<string>()
+{
+"<providerIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("appId").ToString());
+    Console.WriteLine(result[0].GetProperty("appSecret").ToString());
+    Console.WriteLine(result[0].GetProperty("apiKey").ToString());
+    Console.WriteLine(result[0].GetProperty("isProductionApp").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<oauthProviderId>", null);
+BinaryData responseData = operation.Value;
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<oauthProviderId>", new RequestContext());
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<oauthProviderId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -312,20 +415,30 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<oauthProviderId>", new RequestContext());
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<oauthProviderId>", null);
+BinaryData responseData = operation.Value;
+
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<oauthProviderId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -341,9 +454,8 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Parties.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Parties.xml
index 7efea3a3cf27..514db9028dbb 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Parties.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Parties.xml
@@ -2,13 +2,23 @@
 <doc>
   <members>
     <member name="GetPartyAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetPartyAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPartyAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetPartyAsync("<partyId>", new RequestContext());
+Response response = await client.GetPartyAsync("<partyId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPartyAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetPartyAsync("<partyId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -21,18 +31,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetParty(string,RequestContext)">
-<example>
-This sample shows how to call GetParty with required parameters and parse the result.
+      <example>
+This sample shows how to call GetParty and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetParty("<partyId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetParty with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetParty("<partyId>", new RequestContext());
+Response response = client.GetParty("<partyId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -45,40 +64,39 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
-
-var data = new {
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -91,40 +109,39 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
-
-var data = new {
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = client.CreateOrUpdate("<partyId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -137,42 +154,67 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -187,17 +229,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -212,69 +265,125 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetPartiesAsync(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPartiesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPartiesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetPartiesAsync(new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetPartiesAsync(null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPartiesAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetPartiesAsync(new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetParties(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetParties with required parameters and parse the result.
+      <example>
+This sample shows how to call GetParties and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetParties(new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetParties(null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetParties with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetParties(new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", new RequestContext());
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -288,19 +397,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", new RequestContext());
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -314,8 +435,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/PlantTissueAnalyses.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/PlantTissueAnalyses.xml
index 1cd8dbe62cd4..7c3f27b49d3c 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/PlantTissueAnalyses.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/PlantTissueAnalyses.xml
@@ -2,13 +2,23 @@
 <doc>
   <members>
     <member name="GetPlantTissueAnalysisAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetPlantTissueAnalysisAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPlantTissueAnalysisAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetPlantTissueAnalysisAsync("<partyId>", "<plantTissueAnalysisId>", new RequestContext());
+Response response = await client.GetPlantTissueAnalysisAsync("<partyId>", "<plantTissueAnalysisId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPlantTissueAnalysisAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetPlantTissueAnalysisAsync("<partyId>", "<plantTissueAnalysisId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -40,18 +50,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetPlantTissueAnalysis(string,string,RequestContext)">
-<example>
-This sample shows how to call GetPlantTissueAnalysis with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPlantTissueAnalysis and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetPlantTissueAnalysis("<partyId>", "<plantTissueAnalysisId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPlantTissueAnalysis with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetPlantTissueAnalysis("<partyId>", "<plantTissueAnalysisId>", new RequestContext());
+Response response = client.GetPlantTissueAnalysis("<partyId>", "<plantTissueAnalysisId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -83,59 +102,59 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantTissueAnalysisId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantTissueAnalysisId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
-
-var data = new {
-    fieldId = "<fieldId>",
-    cropId = "<cropId>",
-    cropProductId = "<cropProductId>",
-    seasonId = "<seasonId>",
-    plantingDateTime = "2022-05-10T18:57:31.2311892Z",
-    growthStage = "<growthStage>",
-    plantPart = "<plantPart>",
-    plantPosition = "<plantPosition>",
-    plantAppearance = "<plantAppearance>",
-    sampleCollectionCondition = "<sampleCollectionCondition>",
-    sampleCollectionDateTime = "2022-05-10T18:57:31.2311892Z",
-    sampleReceivedDateTime = "2022-05-10T18:57:31.2311892Z",
-    sampleTestResultDateTime = "2022-05-10T18:57:31.2311892Z",
-    labDetails = new {
-        code = "<code>",
-        name = "<name>",
-        description = "<description>",
-        address = "<address>",
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["fieldId"] = "<fieldId>",
+    ["cropId"] = "<cropId>",
+    ["cropProductId"] = "<cropProductId>",
+    ["seasonId"] = "<seasonId>",
+    ["plantingDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["growthStage"] = "<growthStage>",
+    ["plantPart"] = "<plantPart>",
+    ["plantPosition"] = "<plantPosition>",
+    ["plantAppearance"] = "<plantAppearance>",
+    ["sampleCollectionCondition"] = "<sampleCollectionCondition>",
+    ["sampleCollectionDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["sampleReceivedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["sampleTestResultDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["labDetails"] = new Dictionary<string, object>()
+    {
+        ["code"] = "<code>",
+        ["name"] = "<name>",
+        ["description"] = "<description>",
+        ["address"] = "<address>",
     },
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantTissueAnalysisId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantTissueAnalysisId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -167,59 +186,59 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<plantTissueAnalysisId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<plantTissueAnalysisId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
-
-var data = new {
-    fieldId = "<fieldId>",
-    cropId = "<cropId>",
-    cropProductId = "<cropProductId>",
-    seasonId = "<seasonId>",
-    plantingDateTime = "2022-05-10T18:57:31.2311892Z",
-    growthStage = "<growthStage>",
-    plantPart = "<plantPart>",
-    plantPosition = "<plantPosition>",
-    plantAppearance = "<plantAppearance>",
-    sampleCollectionCondition = "<sampleCollectionCondition>",
-    sampleCollectionDateTime = "2022-05-10T18:57:31.2311892Z",
-    sampleReceivedDateTime = "2022-05-10T18:57:31.2311892Z",
-    sampleTestResultDateTime = "2022-05-10T18:57:31.2311892Z",
-    labDetails = new {
-        code = "<code>",
-        name = "<name>",
-        description = "<description>",
-        address = "<address>",
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["fieldId"] = "<fieldId>",
+    ["cropId"] = "<cropId>",
+    ["cropProductId"] = "<cropProductId>",
+    ["seasonId"] = "<seasonId>",
+    ["plantingDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["growthStage"] = "<growthStage>",
+    ["plantPart"] = "<plantPart>",
+    ["plantPosition"] = "<plantPosition>",
+    ["plantAppearance"] = "<plantAppearance>",
+    ["sampleCollectionCondition"] = "<sampleCollectionCondition>",
+    ["sampleCollectionDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["sampleReceivedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["sampleTestResultDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["labDetails"] = new Dictionary<string, object>()
+    {
+        ["code"] = "<code>",
+        ["name"] = "<name>",
+        ["description"] = "<description>",
+        ["address"] = "<address>",
     },
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.CreateOrUpdate("<partyId>", "<plantTissueAnalysisId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<partyId>", "<plantTissueAnalysisId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -251,42 +270,67 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<plantTissueAnalysisId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<plantTissueAnalysisId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<plantTissueAnalysisId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<plantTissueAnalysisId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -301,17 +345,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -326,195 +381,343 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetPlantTissueAnalysesByPartyIdAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPlantTissueAnalysesByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPlantTissueAnalysesByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetPlantTissueAnalysesByPartyIdAsync("<partyId>", new String[]{"<seasonIds>"}, new String[]{"<cropIds>"}, new String[]{"<cropProductsIds>"}, new String[]{"<fieldIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetPlantTissueAnalysesByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("cropProductId").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("plantingDateTime").ToString());
-    Console.WriteLine(result.GetProperty("growthStage").ToString());
-    Console.WriteLine(result.GetProperty("plantPart").ToString());
-    Console.WriteLine(result.GetProperty("plantPosition").ToString());
-    Console.WriteLine(result.GetProperty("plantAppearance").ToString());
-    Console.WriteLine(result.GetProperty("sampleCollectionCondition").ToString());
-    Console.WriteLine(result.GetProperty("sampleCollectionDateTime").ToString());
-    Console.WriteLine(result.GetProperty("sampleReceivedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("sampleTestResultDateTime").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("address").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPlantTissueAnalysesByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetPlantTissueAnalysesByPartyIdAsync("<partyId>", new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<cropProductsIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropProductId").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("growthStage").ToString());
+    Console.WriteLine(result[0].GetProperty("plantPart").ToString());
+    Console.WriteLine(result[0].GetProperty("plantPosition").ToString());
+    Console.WriteLine(result[0].GetProperty("plantAppearance").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleCollectionCondition").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleCollectionDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleReceivedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleTestResultDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("address").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetPlantTissueAnalysesByPartyId(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPlantTissueAnalysesByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPlantTissueAnalysesByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetPlantTissueAnalysesByPartyId("<partyId>", new String[]{"<seasonIds>"}, new String[]{"<cropIds>"}, new String[]{"<cropProductsIds>"}, new String[]{"<fieldIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetPlantTissueAnalysesByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("cropProductId").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("plantingDateTime").ToString());
-    Console.WriteLine(result.GetProperty("growthStage").ToString());
-    Console.WriteLine(result.GetProperty("plantPart").ToString());
-    Console.WriteLine(result.GetProperty("plantPosition").ToString());
-    Console.WriteLine(result.GetProperty("plantAppearance").ToString());
-    Console.WriteLine(result.GetProperty("sampleCollectionCondition").ToString());
-    Console.WriteLine(result.GetProperty("sampleCollectionDateTime").ToString());
-    Console.WriteLine(result.GetProperty("sampleReceivedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("sampleTestResultDateTime").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("address").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPlantTissueAnalysesByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetPlantTissueAnalysesByPartyId("<partyId>", new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<cropProductsIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropProductId").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("growthStage").ToString());
+    Console.WriteLine(result[0].GetProperty("plantPart").ToString());
+    Console.WriteLine(result[0].GetProperty("plantPosition").ToString());
+    Console.WriteLine(result[0].GetProperty("plantAppearance").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleCollectionCondition").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleCollectionDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleReceivedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleTestResultDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("address").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetPlantTissueAnalysesAsync(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPlantTissueAnalysesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPlantTissueAnalysesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetPlantTissueAnalysesAsync(new String[]{"<seasonIds>"}, new String[]{"<cropIds>"}, new String[]{"<cropProductsIds>"}, new String[]{"<fieldIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetPlantTissueAnalysesAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("cropProductId").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("plantingDateTime").ToString());
-    Console.WriteLine(result.GetProperty("growthStage").ToString());
-    Console.WriteLine(result.GetProperty("plantPart").ToString());
-    Console.WriteLine(result.GetProperty("plantPosition").ToString());
-    Console.WriteLine(result.GetProperty("plantAppearance").ToString());
-    Console.WriteLine(result.GetProperty("sampleCollectionCondition").ToString());
-    Console.WriteLine(result.GetProperty("sampleCollectionDateTime").ToString());
-    Console.WriteLine(result.GetProperty("sampleReceivedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("sampleTestResultDateTime").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("address").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPlantTissueAnalysesAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetPlantTissueAnalysesAsync(new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<cropProductsIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropProductId").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("growthStage").ToString());
+    Console.WriteLine(result[0].GetProperty("plantPart").ToString());
+    Console.WriteLine(result[0].GetProperty("plantPosition").ToString());
+    Console.WriteLine(result[0].GetProperty("plantAppearance").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleCollectionCondition").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleCollectionDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleReceivedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleTestResultDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("address").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetPlantTissueAnalyses(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPlantTissueAnalyses with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPlantTissueAnalyses and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetPlantTissueAnalyses(new String[]{"<seasonIds>"}, new String[]{"<cropIds>"}, new String[]{"<cropProductsIds>"}, new String[]{"<fieldIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetPlantTissueAnalyses(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("cropProductId").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("plantingDateTime").ToString());
-    Console.WriteLine(result.GetProperty("growthStage").ToString());
-    Console.WriteLine(result.GetProperty("plantPart").ToString());
-    Console.WriteLine(result.GetProperty("plantPosition").ToString());
-    Console.WriteLine(result.GetProperty("plantAppearance").ToString());
-    Console.WriteLine(result.GetProperty("sampleCollectionCondition").ToString());
-    Console.WriteLine(result.GetProperty("sampleCollectionDateTime").ToString());
-    Console.WriteLine(result.GetProperty("sampleReceivedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("sampleTestResultDateTime").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("labDetails").GetProperty("address").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPlantTissueAnalyses with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetPlantTissueAnalyses(new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<cropProductsIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropProductId").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("growthStage").ToString());
+    Console.WriteLine(result[0].GetProperty("plantPart").ToString());
+    Console.WriteLine(result[0].GetProperty("plantPosition").ToString());
+    Console.WriteLine(result[0].GetProperty("plantAppearance").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleCollectionCondition").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleCollectionDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleReceivedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("sampleTestResultDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("address").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantTissueAnalysisId>", null);
+BinaryData responseData = operation.Value;
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantTissueAnalysisId>", new RequestContext());
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantTissueAnalysisId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -528,19 +731,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantTissueAnalysisId>", new RequestContext());
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantTissueAnalysisId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantTissueAnalysisId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -554,8 +769,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/PlantingData.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/PlantingData.xml
index 2e6392a6a889..41ea7520f562 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/PlantingData.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/PlantingData.xml
@@ -2,13 +2,23 @@
 <doc>
   <members>
     <member name="GetPlantingDataAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetPlantingDataAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPlantingDataAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetPlantingDataAsync("<partyId>", "<plantingDataId>", new RequestContext());
+Response response = await client.GetPlantingDataAsync("<partyId>", "<plantingDataId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPlantingDataAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetPlantingDataAsync("<partyId>", "<plantingDataId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
@@ -42,18 +52,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetPlantingData(string,string,RequestContext)">
-<example>
-This sample shows how to call GetPlantingData with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPlantingData and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetPlantingData("<partyId>", "<plantingDataId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPlantingData with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetPlantingData("<partyId>", "<plantingDataId>", new RequestContext());
+Response response = client.GetPlantingData("<partyId>", "<plantingDataId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
@@ -87,77 +106,67 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantingDataId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantingDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    avgPlantingRate = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    totalMaterial = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    avgMaterial = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    plantingProductDetails = new[] {
-        new {
-            productName = "<productName>",
-            area = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-        }
-    },
-    area = new {
-        unit = "<unit>",
-        value = 123.45d,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["avgPlantingRate"] = new Dictionary<string, object>()
+    {
+        ["unit"] = "<unit>",
+        ["value"] = 123.45,
     },
-    operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    associatedBoundaryId = "<associatedBoundaryId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["totalMaterial"] = null
+,
+    ["avgMaterial"] = null
+,
+    ["plantingProductDetails"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["productName"] = "<productName>",
+["area"] = null
+,
+["totalMaterial"] = null
+,
+["avgMaterial"] = null
+,
+}
+},
+    ["area"] = null
+,
+    ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["associatedBoundaryId"] = "<associatedBoundaryId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantingDataId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantingDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
@@ -191,77 +200,67 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<plantingDataId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<plantingDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    avgPlantingRate = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    totalMaterial = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    avgMaterial = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    plantingProductDetails = new[] {
-        new {
-            productName = "<productName>",
-            area = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-        }
-    },
-    area = new {
-        unit = "<unit>",
-        value = 123.45d,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["avgPlantingRate"] = new Dictionary<string, object>()
+    {
+        ["unit"] = "<unit>",
+        ["value"] = 123.45,
     },
-    operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    associatedBoundaryId = "<associatedBoundaryId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["totalMaterial"] = null
+,
+    ["avgMaterial"] = null
+,
+    ["plantingProductDetails"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["productName"] = "<productName>",
+["area"] = null
+,
+["totalMaterial"] = null
+,
+["avgMaterial"] = null
+,
+}
+},
+    ["area"] = null
+,
+    ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["associatedBoundaryId"] = "<associatedBoundaryId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.CreateOrUpdate("<partyId>", "<plantingDataId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<partyId>", "<plantingDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
@@ -295,42 +294,67 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<plantingDataId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<plantingDataId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<plantingDataId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<plantingDataId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -345,17 +369,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -370,203 +405,327 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAllPlantingDataByPartyIdAsync(string,double?,double?,double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllPlantingDataByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllPlantingDataByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetAllPlantingDataByPartyIdAsync("<partyId>", 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetAllPlantingDataByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllPlantingDataByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetAllPlantingDataByPartyIdAsync("<partyId>", 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllPlantingDataByPartyId(string,double?,double?,double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllPlantingDataByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllPlantingDataByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetAllPlantingDataByPartyId("<partyId>", 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetAllPlantingDataByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllPlantingDataByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetAllPlantingDataByPartyId("<partyId>", 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllPlantingDataAsync(double?,double?,double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllPlantingDataAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllPlantingDataAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetAllPlantingDataAsync(3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<plantingDataIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetAllPlantingDataAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllPlantingDataAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetAllPlantingDataAsync(123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<plantingDataIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllPlantingData(double?,double?,double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllPlantingData with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllPlantingData and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetAllPlantingData(3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<plantingDataIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetAllPlantingData(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllPlantingData with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetAllPlantingData(123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<plantingDataIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantingDataId>", new RequestContext());
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantingDataId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantingDataId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -580,19 +739,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantingDataId>", new RequestContext());
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantingDataId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantingDataId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -606,8 +777,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/PrescriptionMaps.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/PrescriptionMaps.xml
index 05e210756269..382047f3ca30 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/PrescriptionMaps.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/PrescriptionMaps.xml
@@ -2,13 +2,23 @@
 <doc>
   <members>
     <member name="GetPrescriptionMapAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetPrescriptionMapAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPrescriptionMapAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetPrescriptionMapAsync("<partyId>", "<prescriptionMapId>", new RequestContext());
+Response response = await client.GetPrescriptionMapAsync("<partyId>", "<prescriptionMapId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPrescriptionMapAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetPrescriptionMapAsync("<partyId>", "<prescriptionMapId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -26,18 +36,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetPrescriptionMap(string,string,RequestContext)">
-<example>
-This sample shows how to call GetPrescriptionMap with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPrescriptionMap and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetPrescriptionMap("<partyId>", "<prescriptionMapId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPrescriptionMap with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetPrescriptionMap("<partyId>", "<prescriptionMapId>", new RequestContext());
+Response response = client.GetPrescriptionMap("<partyId>", "<prescriptionMapId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -55,44 +74,43 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionMapId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionMapId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
-
-var data = new {
-    type = "<type>",
-    seasonId = "<seasonId>",
-    cropId = "<cropId>",
-    fieldId = "<fieldId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionMapId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["type"] = "<type>",
+    ["seasonId"] = "<seasonId>",
+    ["cropId"] = "<cropId>",
+    ["fieldId"] = "<fieldId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionMapId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -110,44 +128,43 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<prescriptionMapId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<prescriptionMapId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
-
-var data = new {
-    type = "<type>",
-    seasonId = "<seasonId>",
-    cropId = "<cropId>",
-    fieldId = "<fieldId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<prescriptionMapId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["type"] = "<type>",
+    ["seasonId"] = "<seasonId>",
+    ["cropId"] = "<cropId>",
+    ["fieldId"] = "<fieldId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = client.CreateOrUpdate("<partyId>", "<prescriptionMapId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -165,42 +182,67 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<prescriptionMapId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<prescriptionMapId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<prescriptionMapId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<prescriptionMapId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -215,17 +257,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -240,139 +293,299 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetPrescriptionMapsByPartyIdAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPrescriptionMapsByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPrescriptionMapsByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetPrescriptionMapsByPartyIdAsync("<partyId>", new String[]{"<types>"}, new String[]{"<cropIds>"}, new String[]{"<seasonIds>"}, new String[]{"<fieldIds>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetPrescriptionMapsByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPrescriptionMapsByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetPrescriptionMapsByPartyIdAsync("<partyId>", new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetPrescriptionMapsByPartyId(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPrescriptionMapsByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPrescriptionMapsByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetPrescriptionMapsByPartyId("<partyId>", new String[]{"<types>"}, new String[]{"<cropIds>"}, new String[]{"<seasonIds>"}, new String[]{"<fieldIds>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetPrescriptionMapsByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPrescriptionMapsByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetPrescriptionMapsByPartyId("<partyId>", new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetPrescriptionMapsAsync(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPrescriptionMapsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPrescriptionMapsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetPrescriptionMapsAsync(new String[]{"<types>"}, new String[]{"<cropIds>"}, new String[]{"<seasonIds>"}, new String[]{"<fieldIds>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetPrescriptionMapsAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPrescriptionMapsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetPrescriptionMapsAsync(new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetPrescriptionMaps(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPrescriptionMaps with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPrescriptionMaps and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetPrescriptionMaps(new String[]{"<types>"}, new String[]{"<cropIds>"}, new String[]{"<seasonIds>"}, new String[]{"<fieldIds>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetPrescriptionMaps(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPrescriptionMaps with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetPrescriptionMaps(new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionMapId>", new RequestContext());
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionMapId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionMapId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -386,19 +599,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionMapId>", new RequestContext());
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionMapId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionMapId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -412,8 +637,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Prescriptions.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Prescriptions.xml
index c05d9c8fe34c..5609ed6d0a14 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Prescriptions.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Prescriptions.xml
@@ -2,13 +2,23 @@
 <doc>
   <members>
     <member name="GetPrescriptionAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetPrescriptionAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPrescriptionAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetPrescriptionAsync("<partyId>", "<prescriptionId>", new RequestContext());
+Response response = await client.GetPrescriptionAsync("<partyId>", "<prescriptionId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPrescriptionAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetPrescriptionAsync("<partyId>", "<prescriptionId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -16,8 +26,8 @@ Console.WriteLine(result.GetProperty("prescriptionMapId").ToString());
 Console.WriteLine(result.GetProperty("productCode").ToString());
 Console.WriteLine(result.GetProperty("productName").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -28,18 +38,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetPrescription(string,string,RequestContext)">
-<example>
-This sample shows how to call GetPrescription with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPrescription and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetPrescription("<partyId>", "<prescriptionId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPrescription with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetPrescription("<partyId>", "<prescriptionId>", new RequestContext());
+Response response = client.GetPrescription("<partyId>", "<prescriptionId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -47,8 +66,8 @@ Console.WriteLine(result.GetProperty("prescriptionMapId").ToString());
 Console.WriteLine(result.GetProperty("productCode").ToString());
 Console.WriteLine(result.GetProperty("productName").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -59,50 +78,51 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
-
-var data = new {
-    prescriptionMapId = "<prescriptionMapId>",
-    productCode = "<productCode>",
-    productName = "<productName>",
-    type = "<type>",
-    measurements = new {
-        key = new {
-            unit = "<unit>",
-            value = 123.45d,
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["prescriptionMapId"] = "<prescriptionMapId>",
+    ["productCode"] = "<productCode>",
+    ["productName"] = "<productName>",
+    ["type"] = "<type>",
+    ["measurements"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["unit"] = "<unit>",
+            ["value"] = 123.45,
         },
     },
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -110,8 +130,8 @@ Console.WriteLine(result.GetProperty("prescriptionMapId").ToString());
 Console.WriteLine(result.GetProperty("productCode").ToString());
 Console.WriteLine(result.GetProperty("productName").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -122,50 +142,51 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<prescriptionId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<prescriptionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
-
-var data = new {
-    prescriptionMapId = "<prescriptionMapId>",
-    productCode = "<productCode>",
-    productName = "<productName>",
-    type = "<type>",
-    measurements = new {
-        key = new {
-            unit = "<unit>",
-            value = 123.45d,
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["prescriptionMapId"] = "<prescriptionMapId>",
+    ["productCode"] = "<productCode>",
+    ["productName"] = "<productName>",
+    ["type"] = "<type>",
+    ["measurements"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["unit"] = "<unit>",
+            ["value"] = 123.45,
         },
     },
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.CreateOrUpdate("<partyId>", "<prescriptionId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<partyId>", "<prescriptionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -173,8 +194,8 @@ Console.WriteLine(result.GetProperty("prescriptionMapId").ToString());
 Console.WriteLine(result.GetProperty("productCode").ToString());
 Console.WriteLine(result.GetProperty("productName").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("eTag").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -185,42 +206,67 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<prescriptionId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<prescriptionId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<prescriptionId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<prescriptionId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -235,17 +281,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -260,147 +317,307 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetPrescriptionsByPartyIdAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPrescriptionsByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPrescriptionsByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetPrescriptionsByPartyIdAsync("<partyId>", new String[]{"<prescriptionMapIds>"}, new String[]{"<types>"}, new String[]{"<productCodes>"}, new String[]{"<productNames>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetPrescriptionsByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("prescriptionMapId").ToString());
-    Console.WriteLine(result.GetProperty("productCode").ToString());
-    Console.WriteLine(result.GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPrescriptionsByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetPrescriptionsByPartyIdAsync("<partyId>", new List<string>()
+{
+"<prescriptionMapIds>"
+}, new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<productCodes>"
+}, new List<string>()
+{
+"<productNames>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("prescriptionMapId").ToString());
+    Console.WriteLine(result[0].GetProperty("productCode").ToString());
+    Console.WriteLine(result[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetPrescriptionsByPartyId(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPrescriptionsByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPrescriptionsByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetPrescriptionsByPartyId("<partyId>", new String[]{"<prescriptionMapIds>"}, new String[]{"<types>"}, new String[]{"<productCodes>"}, new String[]{"<productNames>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetPrescriptionsByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("prescriptionMapId").ToString());
-    Console.WriteLine(result.GetProperty("productCode").ToString());
-    Console.WriteLine(result.GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPrescriptionsByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetPrescriptionsByPartyId("<partyId>", new List<string>()
+{
+"<prescriptionMapIds>"
+}, new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<productCodes>"
+}, new List<string>()
+{
+"<productNames>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("prescriptionMapId").ToString());
+    Console.WriteLine(result[0].GetProperty("productCode").ToString());
+    Console.WriteLine(result[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetPrescriptionsAsync(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPrescriptionsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPrescriptionsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetPrescriptionsAsync(new String[]{"<prescriptionMapIds>"}, new String[]{"<types>"}, new String[]{"<productCodes>"}, new String[]{"<productNames>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetPrescriptionsAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("prescriptionMapId").ToString());
-    Console.WriteLine(result.GetProperty("productCode").ToString());
-    Console.WriteLine(result.GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPrescriptionsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetPrescriptionsAsync(new List<string>()
+{
+"<prescriptionMapIds>"
+}, new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<productCodes>"
+}, new List<string>()
+{
+"<productNames>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("prescriptionMapId").ToString());
+    Console.WriteLine(result[0].GetProperty("productCode").ToString());
+    Console.WriteLine(result[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetPrescriptions(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPrescriptions with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPrescriptions and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetPrescriptions(new String[]{"<prescriptionMapIds>"}, new String[]{"<types>"}, new String[]{"<productCodes>"}, new String[]{"<productNames>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetPrescriptions(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("prescriptionMapId").ToString());
-    Console.WriteLine(result.GetProperty("productCode").ToString());
-    Console.WriteLine(result.GetProperty("productName").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPrescriptions with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetPrescriptions(new List<string>()
+{
+"<prescriptionMapIds>"
+}, new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<productCodes>"
+}, new List<string>()
+{
+"<productNames>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("prescriptionMapId").ToString());
+    Console.WriteLine(result[0].GetProperty("productCode").ToString());
+    Console.WriteLine(result[0].GetProperty("productName").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionId>", new RequestContext());
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -414,19 +631,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionId>", new RequestContext());
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -440,8 +669,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Scenes.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Scenes.xml
index 0e4a85942567..162833be3a81 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Scenes.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Scenes.xml
@@ -2,49 +2,89 @@
 <doc>
   <members>
     <member name="DownloadAsync(string,RequestContext)">
-<example>
-This sample shows how to call DownloadAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DownloadAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.DownloadAsync("<filePath>", new RequestContext());
+Response response = await client.DownloadAsync("<filePath>", null);
 if (response.ContentStream != null)
 {
-    using(Stream outFileStream = File.OpenWrite("<filePath>"))
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
     {
         response.ContentStream.CopyTo(outFileStream);
     }
 }
 ]]></code>
-</example>
+This sample shows how to call DownloadAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DownloadAsync("<filePath>", null);
+if (response.ContentStream != null)
+{
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
+    {
+        response.ContentStream.CopyTo(outFileStream);
+    }
+}
+]]></code></example>
     </member>
     <member name="Download(string,RequestContext)">
-<example>
-This sample shows how to call Download with required parameters and parse the result.
+      <example>
+This sample shows how to call Download and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.Download("<filePath>", new RequestContext());
+Response response = client.Download("<filePath>", null);
 if (response.ContentStream != null)
 {
-    using(Stream outFileStream = File.OpenWrite("<filePath>"))
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
     {
         response.ContentStream.CopyTo(outFileStream);
     }
 }
 ]]></code>
-</example>
+This sample shows how to call Download with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Download("<filePath>", null);
+if (response.ContentStream != null)
+{
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
+    {
+        response.ContentStream.CopyTo(outFileStream);
+    }
+}
+]]></code></example>
     </member>
     <member name="GetSatelliteDataIngestionJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetSatelliteDataIngestionJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSatelliteDataIngestionJobDetailsAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetSatelliteDataIngestionJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("boundaryId").ToString());
+Console.WriteLine(result.GetProperty("startDateTime").ToString());
+Console.WriteLine(result.GetProperty("endDateTime").ToString());
+Console.WriteLine(result.GetProperty("source").ToString());
+]]></code>
+This sample shows how to call GetSatelliteDataIngestionJobDetailsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetSatelliteDataIngestionJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetSatelliteDataIngestionJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -69,18 +109,31 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSatelliteDataIngestionJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetSatelliteDataIngestionJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSatelliteDataIngestionJobDetails and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetSatelliteDataIngestionJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("boundaryId").ToString());
+Console.WriteLine(result.GetProperty("startDateTime").ToString());
+Console.WriteLine(result.GetProperty("endDateTime").ToString());
+Console.WriteLine(result.GetProperty("source").ToString());
+]]></code>
+This sample shows how to call GetSatelliteDataIngestionJobDetails with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetSatelliteDataIngestionJobDetails("<jobId>", new RequestContext());
+Response response = client.GetSatelliteDataIngestionJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -105,23 +158,22 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="SearchFeaturesAsync(string,RequestContent,int?,int?,RequestContext)">
-<example>
-This sample shows how to call SearchFeaturesAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call SearchFeaturesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
-
-var data = new {
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    endDateTime = "2022-05-10T18:57:31.2311892Z",
-};
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.SearchFeaturesAsync("<collectionId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+});
+Response response = await client.SearchFeaturesAsync("Sentinel_2_L2A", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("stacVersion").ToString());
@@ -130,37 +182,44 @@ Console.WriteLine(result.GetProperty("features")[0].GetProperty("type").ToString
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("properties").ToString());
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("href").ToString());
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("rel").ToString());
-Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("href").ToString());
+Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
 ]]></code>
-This sample shows how to call SearchFeaturesAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call SearchFeaturesAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
-
-var data = new {
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    endDateTime = "2022-05-10T18:57:31.2311892Z",
-    intersects = new {
-        coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-        type = "MultiPolygon",
-    },
-    bbox = new[] {
-        123.45d
-    },
-    featureIds = new[] {
-        "<String>"
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.SearchFeaturesAsync("<collectionId>", RequestContent.Create(data), 1234, 1234);
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["intersects"] = new Dictionary<string, object>()
+    {
+        ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+        ["type"] = "MultiPolygon",
+    },
+    ["bbox"] = new List<object>()
+{
+123.45
+},
+    ["featureIds"] = new List<object>()
+{
+"<featureIds>"
+},
+});
+Response response = await client.SearchFeaturesAsync("Sentinel_2_L2A", content, maxpagesize: 1234, skip: 1234);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("stacVersion").ToString());
@@ -174,29 +233,28 @@ Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetP
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("rel").ToString());
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("title").ToString());
-Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("href").ToString());
-Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("title").ToString());
-Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("roles")[0].ToString());
+Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
+Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("title").ToString());
+Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("roles")[0].ToString());
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("collection").ToString());
 Console.WriteLine(result.GetProperty("nextLink").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="SearchFeatures(string,RequestContent,int?,int?,RequestContext)">
-<example>
-This sample shows how to call SearchFeatures with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call SearchFeatures and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
-
-var data = new {
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    endDateTime = "2022-05-10T18:57:31.2311892Z",
-};
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.SearchFeatures("<collectionId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+});
+Response response = client.SearchFeatures("Sentinel_2_L2A", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("stacVersion").ToString());
@@ -205,37 +263,44 @@ Console.WriteLine(result.GetProperty("features")[0].GetProperty("type").ToString
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("properties").ToString());
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("href").ToString());
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("rel").ToString());
-Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("href").ToString());
+Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
 ]]></code>
-This sample shows how to call SearchFeatures with all parameters and request content, and how to parse the result.
+This sample shows how to call SearchFeatures with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
-
-var data = new {
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    endDateTime = "2022-05-10T18:57:31.2311892Z",
-    intersects = new {
-        coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-        type = "MultiPolygon",
-    },
-    bbox = new[] {
-        123.45d
-    },
-    featureIds = new[] {
-        "<String>"
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.SearchFeatures("<collectionId>", RequestContent.Create(data), 1234, 1234);
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["intersects"] = new Dictionary<string, object>()
+    {
+        ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+        ["type"] = "MultiPolygon",
+    },
+    ["bbox"] = new List<object>()
+{
+123.45
+},
+    ["featureIds"] = new List<object>()
+{
+"<featureIds>"
+},
+});
+Response response = client.SearchFeatures("Sentinel_2_L2A", content, maxpagesize: 1234, skip: 1234);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("stacVersion").ToString());
@@ -249,24 +314,39 @@ Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetP
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("rel").ToString());
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("title").ToString());
-Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("href").ToString());
-Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("title").ToString());
-Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("roles")[0].ToString());
+Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
+Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("title").ToString());
+Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("roles")[0].ToString());
 Console.WriteLine(result.GetProperty("features")[0].GetProperty("collection").ToString());
 Console.WriteLine(result.GetProperty("nextLink").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetStacFeatureAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetStacFeatureAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetStacFeatureAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetStacFeatureAsync("Sentinel_2_L2A", "<featureId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("stacVersion").ToString());
+Console.WriteLine(result.GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("properties").ToString());
+Console.WriteLine(result.GetProperty("links")[0].GetProperty("href").ToString());
+Console.WriteLine(result.GetProperty("links")[0].GetProperty("rel").ToString());
+Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
+]]></code>
+This sample shows how to call GetStacFeatureAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetStacFeatureAsync("<collectionId>", "<featureId>", new RequestContext());
+Response response = await client.GetStacFeatureAsync("Sentinel_2_L2A", "<featureId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("stacVersion").ToString());
@@ -280,23 +360,38 @@ Console.WriteLine(result.GetProperty("links")[0].GetProperty("href").ToString())
 Console.WriteLine(result.GetProperty("links")[0].GetProperty("rel").ToString());
 Console.WriteLine(result.GetProperty("links")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("links")[0].GetProperty("title").ToString());
-Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("href").ToString());
-Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("title").ToString());
-Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("roles")[0].ToString());
+Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
+Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("title").ToString());
+Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("roles")[0].ToString());
 Console.WriteLine(result.GetProperty("collection").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetStacFeature(string,string,RequestContext)">
-<example>
-This sample shows how to call GetStacFeature with required parameters and parse the result.
+      <example>
+This sample shows how to call GetStacFeature and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetStacFeature("Sentinel_2_L2A", "<featureId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("stacVersion").ToString());
+Console.WriteLine(result.GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("properties").ToString());
+Console.WriteLine(result.GetProperty("links")[0].GetProperty("href").ToString());
+Console.WriteLine(result.GetProperty("links")[0].GetProperty("rel").ToString());
+Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
+]]></code>
+This sample shows how to call GetStacFeature with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetStacFeature("<collectionId>", "<featureId>", new RequestContext());
+Response response = client.GetStacFeature("Sentinel_2_L2A", "<featureId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("stacVersion").ToString());
@@ -310,91 +405,128 @@ Console.WriteLine(result.GetProperty("links")[0].GetProperty("href").ToString())
 Console.WriteLine(result.GetProperty("links")[0].GetProperty("rel").ToString());
 Console.WriteLine(result.GetProperty("links")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("links")[0].GetProperty("title").ToString());
-Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("href").ToString());
-Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("title").ToString());
-Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("roles")[0].ToString());
+Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
+Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("title").ToString());
+Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("roles")[0].ToString());
 Console.WriteLine(result.GetProperty("collection").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetScenesAsync(string,string,string,string,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{double},IEnumerable{string},int?,string,RequestContext)">
-<example>
-This sample shows how to call GetScenesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetScenesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetScenesAsync("<provider>", "<partyId>", "<boundaryId>", "<source>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<imageNames>"}, new Double[]{3.14}, new String[]{"<imageFormats>"}, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetScenesAsync("<provider>", "<partyId>", "<boundaryId>", "<source>", null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("sceneDateTime").ToString());
-    Console.WriteLine(result.GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("fileLink").ToString());
-    Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("imageFormat").ToString());
-    Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("resolution").ToString());
-    Console.WriteLine(result.GetProperty("imageFormat").ToString());
-    Console.WriteLine(result.GetProperty("cloudCoverPercentage").ToString());
-    Console.WriteLine(result.GetProperty("darkPixelPercentage").ToString());
-    Console.WriteLine(result.GetProperty("ndviMedianValue").ToString());
-    Console.WriteLine(result.GetProperty("boundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetScenesAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetScenesAsync("<provider>", "<partyId>", "<boundaryId>", "<source>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<imageNames>"
+}, new List<double>()
+{
+123.45
+}, new List<string>()
+{
+"<imageFormats>"
+}, 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("sceneDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("fileLink").ToString());
+    Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("imageFormat").ToString());
+    Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("resolution").ToString());
+    Console.WriteLine(result[0].GetProperty("imageFormat").ToString());
+    Console.WriteLine(result[0].GetProperty("cloudCoverPercentage").ToString());
+    Console.WriteLine(result[0].GetProperty("darkPixelPercentage").ToString());
+    Console.WriteLine(result[0].GetProperty("ndviMedianValue").ToString());
+    Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetScenes(string,string,string,string,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{double},IEnumerable{string},int?,string,RequestContext)">
-<example>
-This sample shows how to call GetScenes with required parameters and parse the result.
+      <example>
+This sample shows how to call GetScenes and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetScenes("<provider>", "<partyId>", "<boundaryId>", "<source>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<imageNames>"}, new Double[]{3.14}, new String[]{"<imageFormats>"}, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetScenes("<provider>", "<partyId>", "<boundaryId>", "<source>", null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("sceneDateTime").ToString());
-    Console.WriteLine(result.GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("fileLink").ToString());
-    Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("imageFormat").ToString());
-    Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("resolution").ToString());
-    Console.WriteLine(result.GetProperty("imageFormat").ToString());
-    Console.WriteLine(result.GetProperty("cloudCoverPercentage").ToString());
-    Console.WriteLine(result.GetProperty("darkPixelPercentage").ToString());
-    Console.WriteLine(result.GetProperty("ndviMedianValue").ToString());
-    Console.WriteLine(result.GetProperty("boundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetScenes with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetScenes("<provider>", "<partyId>", "<boundaryId>", "<source>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<imageNames>"
+}, new List<double>()
+{
+123.45
+}, new List<string>()
+{
+"<imageFormats>"
+}, 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("sceneDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("fileLink").ToString());
+    Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("imageFormat").ToString());
+    Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("resolution").ToString());
+    Console.WriteLine(result[0].GetProperty("imageFormat").ToString());
+    Console.WriteLine(result[0].GetProperty("cloudCoverPercentage").ToString());
+    Console.WriteLine(result[0].GetProperty("darkPixelPercentage").ToString());
+    Console.WriteLine(result[0].GetProperty("ndviMedianValue").ToString());
+    Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateSatelliteDataIngestionJobAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateSatelliteDataIngestionJobAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateSatelliteDataIngestionJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    endDateTime = "2022-05-10T18:57:31.2311892Z",
-    source = "Sentinel_2_L2A",
-};
-
-var operation = await client.CreateSatelliteDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["source"] = "Sentinel_2_L2A",
+});
+Operation<BinaryData> operation = await client.CreateSatelliteDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -402,39 +534,44 @@ Console.WriteLine(result.GetProperty("startDateTime").ToString());
 Console.WriteLine(result.GetProperty("endDateTime").ToString());
 Console.WriteLine(result.GetProperty("source").ToString());
 ]]></code>
-This sample shows how to call CreateSatelliteDataIngestionJobAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateSatelliteDataIngestionJobAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    endDateTime = "2022-05-10T18:57:31.2311892Z",
-    provider = "Microsoft",
-    source = "Sentinel_2_L2A",
-    data = new {
-        imageNames = new[] {
-            "<String>"
-        },
-        imageFormats = new[] {
-            "<String>"
-        },
-        imageResolutions = new[] {
-            123.45d
-        },
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["provider"] = "Microsoft",
+    ["source"] = "Sentinel_2_L2A",
+    ["data"] = new Dictionary<string, object>()
+    {
+        ["imageNames"] = new List<object>()
+{
+"<imageNames>"
+},
+        ["imageFormats"] = new List<object>()
+{
+"<imageFormats>"
+},
+        ["imageResolutions"] = new List<object>()
+{
+123.45
+},
     },
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = await client.CreateSatelliteDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = await client.CreateSatelliteDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -458,28 +595,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateSatelliteDataIngestionJob(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateSatelliteDataIngestionJob with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateSatelliteDataIngestionJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    endDateTime = "2022-05-10T18:57:31.2311892Z",
-    source = "Sentinel_2_L2A",
-};
-
-var operation = client.CreateSatelliteDataIngestionJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["source"] = "Sentinel_2_L2A",
+});
+Operation<BinaryData> operation = client.CreateSatelliteDataIngestionJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -487,39 +623,44 @@ Console.WriteLine(result.GetProperty("startDateTime").ToString());
 Console.WriteLine(result.GetProperty("endDateTime").ToString());
 Console.WriteLine(result.GetProperty("source").ToString());
 ]]></code>
-This sample shows how to call CreateSatelliteDataIngestionJob with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateSatelliteDataIngestionJob with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    endDateTime = "2022-05-10T18:57:31.2311892Z",
-    provider = "Microsoft",
-    source = "Sentinel_2_L2A",
-    data = new {
-        imageNames = new[] {
-            "<String>"
-        },
-        imageFormats = new[] {
-            "<String>"
-        },
-        imageResolutions = new[] {
-            123.45d
-        },
+TokenCredential credential = new DefaultAzureCredential();
+Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["provider"] = "Microsoft",
+    ["source"] = "Sentinel_2_L2A",
+    ["data"] = new Dictionary<string, object>()
+    {
+        ["imageNames"] = new List<object>()
+{
+"<imageNames>"
+},
+        ["imageFormats"] = new List<object>()
+{
+"<imageFormats>"
+},
+        ["imageResolutions"] = new List<object>()
+{
+123.45
+},
     },
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = client.CreateSatelliteDataIngestionJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = client.CreateSatelliteDataIngestionJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -543,9 +684,8 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SeasonalFields.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SeasonalFields.xml
index 728fdf0b5778..3f5592b254a2 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SeasonalFields.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SeasonalFields.xml
@@ -2,13 +2,23 @@
 <doc>
   <members>
     <member name="GetSeasonalFieldAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetSeasonalFieldAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSeasonalFieldAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetSeasonalFieldAsync("<partyId>", "<seasonalFieldId>", new RequestContext());
+Response response = await client.GetSeasonalFieldAsync("<partyId>", "<seasonalFieldId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSeasonalFieldAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetSeasonalFieldAsync("<partyId>", "<seasonalFieldId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -27,18 +37,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSeasonalField(string,string,RequestContext)">
-<example>
-This sample shows how to call GetSeasonalField with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSeasonalField and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetSeasonalField("<partyId>", "<seasonalFieldId>", new RequestContext());
+Response response = client.GetSeasonalField("<partyId>", "<seasonalFieldId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSeasonalField with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetSeasonalField("<partyId>", "<seasonalFieldId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -57,47 +76,47 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<seasonalFieldId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<seasonalFieldId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
-
-var data = new {
-    farmId = "<farmId>",
-    fieldId = "<fieldId>",
-    seasonId = "<seasonId>",
-    cropProductIds = new[] {
-        "<String>"
-    },
-    cropId = "<cropId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<seasonalFieldId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["farmId"] = "<farmId>",
+    ["fieldId"] = "<fieldId>",
+    ["seasonId"] = "<seasonId>",
+    ["cropProductIds"] = new List<object>()
+{
+"<cropProductIds>"
+},
+    ["cropId"] = "<cropId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<seasonalFieldId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -116,47 +135,47 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = client.CreateOrUpdate("<partyId>", "<seasonalFieldId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<seasonalFieldId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
-
-var data = new {
-    farmId = "<farmId>",
-    fieldId = "<fieldId>",
-    seasonId = "<seasonId>",
-    cropProductIds = new[] {
-        "<String>"
-    },
-    cropId = "<cropId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<seasonalFieldId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["farmId"] = "<farmId>",
+    ["fieldId"] = "<fieldId>",
+    ["seasonId"] = "<seasonId>",
+    ["cropProductIds"] = new List<object>()
+{
+"<cropProductIds>"
+},
+    ["cropId"] = "<cropId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = client.CreateOrUpdate("<partyId>", "<seasonalFieldId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -175,42 +194,67 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<seasonalFieldId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<seasonalFieldId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<seasonalFieldId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<seasonalFieldId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -225,17 +269,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -250,143 +305,303 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetSeasonalFieldsByPartyIdAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSeasonalFieldsByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSeasonalFieldsByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetSeasonalFieldsByPartyIdAsync("<partyId>", new String[]{"<farmIds>"}, new String[]{"<fieldIds>"}, new String[]{"<seasonIds>"}, new String[]{"<cropProductIds>"}, new String[]{"<cropIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetSeasonalFieldsByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("farmId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("cropProductIds")[0].ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSeasonalFieldsByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetSeasonalFieldsByPartyIdAsync("<partyId>", new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropProductIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("farmId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropProductIds")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSeasonalFieldsByPartyId(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSeasonalFieldsByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSeasonalFieldsByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetSeasonalFieldsByPartyId("<partyId>", new String[]{"<farmIds>"}, new String[]{"<fieldIds>"}, new String[]{"<seasonIds>"}, new String[]{"<cropProductIds>"}, new String[]{"<cropIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetSeasonalFieldsByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("farmId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("cropProductIds")[0].ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSeasonalFieldsByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetSeasonalFieldsByPartyId("<partyId>", new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropProductIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("farmId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropProductIds")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSeasonalFieldsAsync(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSeasonalFieldsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSeasonalFieldsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetSeasonalFieldsAsync(new String[]{"<farmIds>"}, new String[]{"<fieldIds>"}, new String[]{"<seasonIds>"}, new String[]{"<cropProductIds>"}, new String[]{"<cropIds>"}, new String[]{"<seasonalFieldIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetSeasonalFieldsAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("farmId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("cropProductIds")[0].ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSeasonalFieldsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetSeasonalFieldsAsync(new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropProductIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonalFieldIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("farmId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropProductIds")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSeasonalFields(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSeasonalFields with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSeasonalFields and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetSeasonalFields(new String[]{"<farmIds>"}, new String[]{"<fieldIds>"}, new String[]{"<seasonIds>"}, new String[]{"<cropProductIds>"}, new String[]{"<cropIds>"}, new String[]{"<seasonalFieldIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetSeasonalFields(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("farmId").ToString());
-    Console.WriteLine(result.GetProperty("fieldId").ToString());
-    Console.WriteLine(result.GetProperty("seasonId").ToString());
-    Console.WriteLine(result.GetProperty("cropProductIds")[0].ToString());
-    Console.WriteLine(result.GetProperty("cropId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSeasonalFields with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetSeasonalFields(new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropProductIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonalFieldIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("farmId").ToString());
+    Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+    Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+    Console.WriteLine(result[0].GetProperty("cropProductIds")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("cropId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<seasonalFieldId>", new RequestContext());
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<seasonalFieldId>", null);
+BinaryData responseData = operation.Value;
+
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<seasonalFieldId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -400,19 +615,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<seasonalFieldId>", null);
+BinaryData responseData = operation.Value;
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<seasonalFieldId>", new RequestContext());
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<seasonalFieldId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -426,8 +653,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Seasons.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Seasons.xml
index 7c8a88622cdd..3f6fa30a91c9 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Seasons.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Seasons.xml
@@ -2,13 +2,23 @@
 <doc>
   <members>
     <member name="GetSeasonAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetSeasonAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSeasonAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetSeasonAsync("<seasonId>", new RequestContext());
+Response response = await client.GetSeasonAsync("<seasonId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSeasonAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetSeasonAsync("<seasonId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("startDateTime").ToString());
@@ -25,18 +35,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSeason(string,RequestContext)">
-<example>
-This sample shows how to call GetSeason with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSeason and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetSeason("<seasonId>", new RequestContext());
+Response response = client.GetSeason("<seasonId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSeason with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetSeason("<seasonId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("startDateTime").ToString());
@@ -53,44 +72,43 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<seasonId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<seasonId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
-
-var data = new {
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    endDateTime = "2022-05-10T18:57:31.2311892Z",
-    year = 1234,
-    geographicIdentifier = "<geographicIdentifier>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<seasonId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["year"] = 1234,
+    ["geographicIdentifier"] = "<geographicIdentifier>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = await client.CreateOrUpdateAsync("<seasonId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("startDateTime").ToString());
@@ -107,44 +125,43 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<seasonId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<seasonId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
-
-var data = new {
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    endDateTime = "2022-05-10T18:57:31.2311892Z",
-    year = 1234,
-    geographicIdentifier = "<geographicIdentifier>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<seasonId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["year"] = 1234,
+    ["geographicIdentifier"] = "<geographicIdentifier>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = client.CreateOrUpdate("<seasonId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("startDateTime").ToString());
@@ -161,91 +178,154 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<seasonId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<seasonId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<seasonId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<seasonId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetSeasonsAsync(DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,IEnumerable{int},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSeasonsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSeasonsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetSeasonsAsync(DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, new Int32[]{1234}, new String[]{"<seasonIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetSeasonsAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("startDateTime").ToString());
-    Console.WriteLine(result.GetProperty("endDateTime").ToString());
-    Console.WriteLine(result.GetProperty("year").ToString());
-    Console.WriteLine(result.GetProperty("geographicIdentifier").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSeasonsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetSeasonsAsync(DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), new List<int>()
+{
+1234
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("endDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("year").ToString());
+    Console.WriteLine(result[0].GetProperty("geographicIdentifier").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSeasons(DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,IEnumerable{int},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSeasons with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSeasons and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetSeasons(DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, new Int32[]{1234}, new String[]{"<seasonIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetSeasons(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("startDateTime").ToString());
-    Console.WriteLine(result.GetProperty("endDateTime").ToString());
-    Console.WriteLine(result.GetProperty("year").ToString());
-    Console.WriteLine(result.GetProperty("geographicIdentifier").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSeasons with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetSeasons(DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), new List<int>()
+{
+1234
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("endDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("year").ToString());
+    Console.WriteLine(result[0].GetProperty("geographicIdentifier").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorDataModels.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorDataModels.xml
index 3a280a2ff409..713d9982c783 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorDataModels.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorDataModels.xml
@@ -2,64 +2,70 @@
 <doc>
   <members>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    measures = new {
-        key = new {
-            dataType = "Bool",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["measures"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["dataType"] = "Bool",
         },
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorDataModelId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorDataModelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    type = "<type>",
-    manufacturer = "<manufacturer>",
-    productCode = "<productCode>",
-    measures = new {
-        key = new {
-            description = "<description>",
-            dataType = "Bool",
-            type = "<type>",
-            unit = "<unit>",
-            properties = new {
-                key = new {},
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["type"] = "<type>",
+    ["manufacturer"] = "<manufacturer>",
+    ["productCode"] = "<productCode>",
+    ["measures"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["description"] = "<description>",
+            ["dataType"] = "Bool",
+            ["type"] = "<type>",
+            ["unit"] = "<unit>",
+            ["properties"] = new Dictionary<string, object>()
+            {
+                ["key"] = new Dictionary<string, object>(),
             },
         },
     },
-    status = "<status>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["status"] = "<status>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorDataModelId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorDataModelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("manufacturer").ToString());
 Console.WriteLine(result.GetProperty("productCode").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("properties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("properties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -70,69 +76,74 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    measures = new {
-        key = new {
-            dataType = "Bool",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["measures"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["dataType"] = "Bool",
         },
     },
-};
-
-Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorDataModelId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorDataModelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    type = "<type>",
-    manufacturer = "<manufacturer>",
-    productCode = "<productCode>",
-    measures = new {
-        key = new {
-            description = "<description>",
-            dataType = "Bool",
-            type = "<type>",
-            unit = "<unit>",
-            properties = new {
-                key = new {},
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["type"] = "<type>",
+    ["manufacturer"] = "<manufacturer>",
+    ["productCode"] = "<productCode>",
+    ["measures"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["description"] = "<description>",
+            ["dataType"] = "Bool",
+            ["type"] = "<type>",
+            ["unit"] = "<unit>",
+            ["properties"] = new Dictionary<string, object>()
+            {
+                ["key"] = new Dictionary<string, object>(),
             },
         },
     },
-    status = "<status>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["status"] = "<status>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorDataModelId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorDataModelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("manufacturer").ToString());
 Console.WriteLine(result.GetProperty("productCode").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("properties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("properties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -143,28 +154,37 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSensorDataModelAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetSensorDataModelAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorDataModelAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetSensorDataModelAsync("<sensorPartnerId>", "<sensorDataModelId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
+]]></code>
+This sample shows how to call GetSensorDataModelAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetSensorDataModelAsync("<sensorPartnerId>", "<sensorDataModelId>", new RequestContext());
+Response response = await client.GetSensorDataModelAsync("<sensorPartnerId>", "<sensorDataModelId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("manufacturer").ToString());
 Console.WriteLine(result.GetProperty("productCode").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("properties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("properties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -175,28 +195,37 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSensorDataModel(string,string,RequestContext)">
-<example>
-This sample shows how to call GetSensorDataModel with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorDataModel and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetSensorDataModel("<sensorPartnerId>", "<sensorDataModelId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
+]]></code>
+This sample shows how to call GetSensorDataModel with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetSensorDataModel("<sensorPartnerId>", "<sensorDataModelId>", new RequestContext());
+Response response = client.GetSensorDataModel("<sensorPartnerId>", "<sensorDataModelId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("manufacturer").ToString());
 Console.WriteLine(result.GetProperty("productCode").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("properties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("properties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -207,99 +236,156 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<sensorPartnerId>", "<sensorDataModelId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<sensorPartnerId>", "<sensorDataModelId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<sensorPartnerId>", "<sensorDataModelId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<sensorPartnerId>", "<sensorDataModelId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetSensorDataModelsAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSensorDataModelsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorDataModelsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetSensorDataModelsAsync("<sensorPartnerId>", new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetSensorDataModelsAsync("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("manufacturer").ToString());
-    Console.WriteLine(result.GetProperty("productCode").ToString());
-    Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
-    Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("properties").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSensorDataModelsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetSensorDataModelsAsync("<sensorPartnerId>", new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("manufacturer").ToString());
+    Console.WriteLine(result[0].GetProperty("productCode").ToString());
+    Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
+    Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("properties").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSensorDataModels(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSensorDataModels with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorDataModels and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetSensorDataModels("<sensorPartnerId>", new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetSensorDataModels("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("manufacturer").ToString());
-    Console.WriteLine(result.GetProperty("productCode").ToString());
-    Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
-    Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("properties").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSensorDataModels with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetSensorDataModels("<sensorPartnerId>", new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("manufacturer").ToString());
+    Console.WriteLine(result[0].GetProperty("productCode").ToString());
+    Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
+    Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("properties").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorEvents.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorEvents.xml
index cb0c84b3fef2..b2d96bf4d959 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorEvents.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorEvents.xml
@@ -2,13 +2,23 @@
 <doc>
   <members>
     <member name="GetSensorEventsAsync(string,string,DateTimeOffset?,DateTimeOffset?,bool?,RequestContext)">
-<example>
-This sample shows how to call GetSensorEventsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorEventsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorEventsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorEvents client = new FarmBeatsClient(credential).GetSensorEventsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetSensorEventsAsync("<sensorId>", "<sensorPartnerId>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, true, new RequestContext());
+Response response = await client.GetSensorEventsAsync("<sensorId>", "<sensorPartnerId>", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("value")[0].ToString());
+]]></code>
+This sample shows how to call GetSensorEventsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorEvents client = new FarmBeatsClient(credential).GetSensorEventsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetSensorEventsAsync("<sensorId>", "<sensorPartnerId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), true, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("sensorId").ToString());
@@ -17,20 +27,29 @@ Console.WriteLine(result.GetProperty("value")[0].GetProperty("partyId").ToString
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("boundaryId").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("eventDateTime").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("ingestionDateTime").ToString());
-Console.WriteLine(result.GetProperty("value")[0].GetProperty("measures").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("value")[0].GetProperty("measures").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("skipToken").ToString());
 Console.WriteLine(result.GetProperty("nextLink").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetSensorEvents(string,string,DateTimeOffset?,DateTimeOffset?,bool?,RequestContext)">
-<example>
-This sample shows how to call GetSensorEvents with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorEvents and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorEventsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorEvents client = new FarmBeatsClient(credential).GetSensorEventsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetSensorEvents("<sensorId>", "<sensorPartnerId>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, true, new RequestContext());
+Response response = client.GetSensorEvents("<sensorId>", "<sensorPartnerId>", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("value")[0].ToString());
+]]></code>
+This sample shows how to call GetSensorEvents with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorEvents client = new FarmBeatsClient(credential).GetSensorEventsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetSensorEvents("<sensorId>", "<sensorPartnerId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), true, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("sensorId").ToString());
@@ -39,11 +58,10 @@ Console.WriteLine(result.GetProperty("value")[0].GetProperty("partyId").ToString
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("boundaryId").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("eventDateTime").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("ingestionDateTime").ToString());
-Console.WriteLine(result.GetProperty("value")[0].GetProperty("measures").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("value")[0].GetProperty("measures").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("skipToken").ToString());
 Console.WriteLine(result.GetProperty("nextLink").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorMappings.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorMappings.xml
index bbc5e42d2e77..04a0143953e2 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorMappings.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorMappings.xml
@@ -2,38 +2,38 @@
 <doc>
   <members>
     <member name="CreateOrUpdateAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<sensorMappingId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<sensorMappingId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
-
-var data = new {
-    sensorId = "<sensorId>",
-    sensorPartnerId = "<sensorPartnerId>",
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    status = "<status>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<sensorMappingId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["sensorId"] = "<sensorId>",
+    ["sensorPartnerId"] = "<sensorPartnerId>",
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["status"] = "<status>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = await client.CreateOrUpdateAsync("<sensorMappingId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("sensorId").ToString());
@@ -49,43 +49,42 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = client.CreateOrUpdate("<sensorMappingId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<sensorMappingId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
-
-var data = new {
-    sensorId = "<sensorId>",
-    sensorPartnerId = "<sensorPartnerId>",
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    status = "<status>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<sensorMappingId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["sensorId"] = "<sensorId>",
+    ["sensorPartnerId"] = "<sensorPartnerId>",
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["status"] = "<status>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = client.CreateOrUpdate("<sensorMappingId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("sensorId").ToString());
@@ -101,18 +100,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSensorMappingAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetSensorMappingAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorMappingAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetSensorMappingAsync("<sensorMappingId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSensorMappingAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetSensorMappingAsync("<sensorMappingId>", new RequestContext());
+Response response = await client.GetSensorMappingAsync("<sensorMappingId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("sensorId").ToString());
@@ -128,18 +136,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSensorMapping(string,RequestContext)">
-<example>
-This sample shows how to call GetSensorMapping with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorMapping and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetSensorMapping("<sensorMappingId>", new RequestContext());
+Response response = client.GetSensorMapping("<sensorMappingId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSensorMapping with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetSensorMapping("<sensorMappingId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("sensorId").ToString());
@@ -155,89 +172,170 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<sensorMappingId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<sensorMappingId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<sensorMappingId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<sensorMappingId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetSensorMappingsAsync(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSensorMappingsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorMappingsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetSensorMappingsAsync(new String[]{"<sensorIds>"}, new String[]{"<sensorPartnerIds>"}, new String[]{"<partyIds>"}, new String[]{"<boundaryIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetSensorMappingsAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("sensorId").ToString());
-    Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("boundaryId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSensorMappingsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetSensorMappingsAsync(new List<string>()
+{
+"<sensorIds>"
+}, new List<string>()
+{
+"<sensorPartnerIds>"
+}, new List<string>()
+{
+"<partyIds>"
+}, new List<string>()
+{
+"<boundaryIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("sensorId").ToString());
+    Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSensorMappings(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSensorMappings with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorMappings and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetSensorMappings(new String[]{"<sensorIds>"}, new String[]{"<sensorPartnerIds>"}, new String[]{"<partyIds>"}, new String[]{"<boundaryIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetSensorMappings(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("sensorId").ToString());
-    Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("boundaryId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSensorMappings with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetSensorMappings(new List<string>()
+{
+"<sensorIds>"
+}, new List<string>()
+{
+"<sensorPartnerIds>"
+}, new List<string>()
+{
+"<partyIds>"
+}, new List<string>()
+{
+"<boundaryIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("sensorId").ToString());
+    Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorPartnerIntegrations.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorPartnerIntegrations.xml
index bf99c3eb3df4..c9815e558fcb 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorPartnerIntegrations.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SensorPartnerIntegrations.xml
@@ -2,35 +2,35 @@
 <doc>
   <members>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<integrationId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<integrationId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    status = "<status>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<integrationId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["status"] = "<status>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<integrationId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("integrationId").ToString());
@@ -45,40 +45,39 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<sensorPartnerId>", "<integrationId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<sensorPartnerId>", "<integrationId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
-
-var data = new {
-    partyId = "<partyId>",
-    status = "<status>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<sensorPartnerId>", "<integrationId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["partyId"] = "<partyId>",
+    ["status"] = "<status>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = client.CreateOrUpdate("<sensorPartnerId>", "<integrationId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("integrationId").ToString());
@@ -93,18 +92,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSensorPartnerIntegrationAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetSensorPartnerIntegrationAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorPartnerIntegrationAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetSensorPartnerIntegrationAsync("<sensorPartnerId>", "<integrationId>", new RequestContext());
+Response response = await client.GetSensorPartnerIntegrationAsync("<sensorPartnerId>", "<integrationId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSensorPartnerIntegrationAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetSensorPartnerIntegrationAsync("<sensorPartnerId>", "<integrationId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("integrationId").ToString());
@@ -119,18 +127,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSensorPartnerIntegration(string,string,RequestContext)">
-<example>
-This sample shows how to call GetSensorPartnerIntegration with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorPartnerIntegration and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetSensorPartnerIntegration("<sensorPartnerId>", "<integrationId>", new RequestContext());
+Response response = client.GetSensorPartnerIntegration("<sensorPartnerId>", "<integrationId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSensorPartnerIntegration with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetSensorPartnerIntegration("<sensorPartnerId>", "<integrationId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("integrationId").ToString());
@@ -145,149 +162,254 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<sensorPartnerId>", "<integrationId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<sensorPartnerId>", "<integrationId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<sensorPartnerId>", "<integrationId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<sensorPartnerId>", "<integrationId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="CheckConsentAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call CheckConsentAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CheckConsentAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.CheckConsentAsync("<sensorPartnerId>", "<integrationId>", "<key>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call CheckConsentAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CheckConsentAsync("<sensorPartnerId>", "<integrationId>", "<key>", new RequestContext());
+Response response = await client.CheckConsentAsync("<sensorPartnerId>", "<integrationId>", "<key>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("consented").ToString());
 Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
 Console.WriteLine(result.GetProperty("integrationId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CheckConsent(string,string,string,RequestContext)">
-<example>
-This sample shows how to call CheckConsent with required parameters and parse the result.
+      <example>
+This sample shows how to call CheckConsent and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.CheckConsent("<sensorPartnerId>", "<integrationId>", "<key>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call CheckConsent with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CheckConsent("<sensorPartnerId>", "<integrationId>", "<key>", new RequestContext());
+Response response = client.CheckConsent("<sensorPartnerId>", "<integrationId>", "<key>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("consented").ToString());
 Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
 Console.WriteLine(result.GetProperty("integrationId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GenerateConsentLinkAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GenerateConsentLinkAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GenerateConsentLinkAsync and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GenerateConsentLinkAsync("<sensorPartnerId>", "<integrationId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GenerateConsentLinkAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GenerateConsentLinkAsync("<sensorPartnerId>", "<integrationId>", new RequestContext());
+Response response = await client.GenerateConsentLinkAsync("<sensorPartnerId>", "<integrationId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("consentLink").ToString());
 Console.WriteLine(result.GetProperty("consentExpiryDateTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GenerateConsentLink(string,string,RequestContext)">
-<example>
-This sample shows how to call GenerateConsentLink with required parameters and parse the result.
+      <example>
+This sample shows how to call GenerateConsentLink and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GenerateConsentLink("<sensorPartnerId>", "<integrationId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GenerateConsentLink with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GenerateConsentLink("<sensorPartnerId>", "<integrationId>", new RequestContext());
+Response response = client.GenerateConsentLink("<sensorPartnerId>", "<integrationId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("consentLink").ToString());
 Console.WriteLine(result.GetProperty("consentExpiryDateTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetSensorPartnerIntegrationsAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSensorPartnerIntegrationsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorPartnerIntegrationsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetSensorPartnerIntegrationsAsync("<sensorPartnerId>", new String[]{"<integrationIds>"}, new String[]{"<partyIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetSensorPartnerIntegrationsAsync("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("integrationId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSensorPartnerIntegrationsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetSensorPartnerIntegrationsAsync("<sensorPartnerId>", new List<string>()
+{
+"<integrationIds>"
+}, new List<string>()
+{
+"<partyIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("integrationId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSensorPartnerIntegrations(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSensorPartnerIntegrations with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorPartnerIntegrations and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetSensorPartnerIntegrations("<sensorPartnerId>", new String[]{"<integrationIds>"}, new String[]{"<partyIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetSensorPartnerIntegrations("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("integrationId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSensorPartnerIntegrations with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetSensorPartnerIntegrations("<sensorPartnerId>", new List<string>()
+{
+"<integrationIds>"
+}, new List<string>()
+{
+"<partyIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("integrationId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Sensors.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Sensors.xml
index 89c6bcfa03c7..76cd8e79a8ad 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Sensors.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Sensors.xml
@@ -2,50 +2,53 @@
 <doc>
   <members>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
-
-var data = new {
-    sensorDataModelId = "<sensorDataModelId>",
-    integrationId = "<integrationId>",
-    hardwareId = "<hardwareId>",
-    deviceId = "<deviceId>",
-    type = "<type>",
-    location = new {
-        latitude = 123.45d,
-        longitude = 123.45d,
-    },
-    port = new {
-        name = "<name>",
-        type = "<type>",
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["sensorDataModelId"] = "<sensorDataModelId>",
+    ["integrationId"] = "<integrationId>",
+    ["hardwareId"] = "<hardwareId>",
+    ["deviceId"] = "<deviceId>",
+    ["type"] = "<type>",
+    ["location"] = new Dictionary<string, object>()
+    {
+        ["latitude"] = 123.45,
+        ["longitude"] = 123.45,
     },
-    depthInMeters = new[] {
-        123.45d
+    ["port"] = new Dictionary<string, object>()
+    {
+        ["name"] = "<name>",
+        ["type"] = "<type>",
     },
-    status = "<status>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["depthInMeters"] = new List<object>()
+{
+123.45
+},
+    ["status"] = "<status>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("sensorDataModelId").ToString());
@@ -68,55 +71,57 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
-
-var data = new {
-    sensorDataModelId = "<sensorDataModelId>",
-    integrationId = "<integrationId>",
-    hardwareId = "<hardwareId>",
-    deviceId = "<deviceId>",
-    type = "<type>",
-    location = new {
-        latitude = 123.45d,
-        longitude = 123.45d,
-    },
-    port = new {
-        name = "<name>",
-        type = "<type>",
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["sensorDataModelId"] = "<sensorDataModelId>",
+    ["integrationId"] = "<integrationId>",
+    ["hardwareId"] = "<hardwareId>",
+    ["deviceId"] = "<deviceId>",
+    ["type"] = "<type>",
+    ["location"] = new Dictionary<string, object>()
+    {
+        ["latitude"] = 123.45,
+        ["longitude"] = 123.45,
     },
-    depthInMeters = new[] {
-        123.45d
+    ["port"] = new Dictionary<string, object>()
+    {
+        ["name"] = "<name>",
+        ["type"] = "<type>",
     },
-    status = "<status>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["depthInMeters"] = new List<object>()
+{
+123.45
+},
+    ["status"] = "<status>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("sensorDataModelId").ToString());
@@ -139,18 +144,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSensorAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetSensorAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetSensorAsync("<sensorPartnerId>", "<sensorId>", new RequestContext());
+Response response = await client.GetSensorAsync("<sensorPartnerId>", "<sensorId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSensorAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetSensorAsync("<sensorPartnerId>", "<sensorId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("sensorDataModelId").ToString());
@@ -173,18 +187,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetSensor(string,string,RequestContext)">
-<example>
-This sample shows how to call GetSensor with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensor and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetSensor("<sensorPartnerId>", "<sensorId>", new RequestContext());
+Response response = client.GetSensor("<sensorPartnerId>", "<sensorId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSensor with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetSensor("<sensorPartnerId>", "<sensorId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("sensorDataModelId").ToString());
@@ -207,171 +230,290 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<sensorPartnerId>", "<sensorId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<sensorPartnerId>", "<sensorId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<sensorPartnerId>", "<sensorId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<sensorPartnerId>", "<sensorId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetConnectionStringAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetConnectionStringAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetConnectionStringAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetConnectionStringAsync("<sensorPartnerId>", "<sensorId>", new RequestContext());
+Response response = await client.GetConnectionStringAsync("<sensorPartnerId>", "<sensorId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetConnectionStringAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetConnectionStringAsync("<sensorPartnerId>", "<sensorId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("primaryDeviceConnectionString").ToString());
 Console.WriteLine(result.GetProperty("secondaryDeviceConnectionString").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetConnectionString(string,string,RequestContext)">
-<example>
-This sample shows how to call GetConnectionString with required parameters and parse the result.
+      <example>
+This sample shows how to call GetConnectionString and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetConnectionString("<sensorPartnerId>", "<sensorId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetConnectionString with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetConnectionString("<sensorPartnerId>", "<sensorId>", new RequestContext());
+Response response = client.GetConnectionString("<sensorPartnerId>", "<sensorId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("primaryDeviceConnectionString").ToString());
 Console.WriteLine(result.GetProperty("secondaryDeviceConnectionString").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RenewConnectionStringAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call RenewConnectionStringAsync with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call RenewConnectionStringAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["connectionStringType"] = "Primary",
+});
+Response response = await client.RenewConnectionStringAsync("<sensorPartnerId>", "<sensorId>", content);
 
-var data = new {
-    connectionStringType = "Primary",
-};
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call RenewConnectionStringAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.RenewConnectionStringAsync("<sensorPartnerId>", "<sensorId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["connectionStringType"] = "Primary",
+});
+Response response = await client.RenewConnectionStringAsync("<sensorPartnerId>", "<sensorId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("primaryDeviceConnectionString").ToString());
 Console.WriteLine(result.GetProperty("secondaryDeviceConnectionString").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RenewConnectionString(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call RenewConnectionString with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call RenewConnectionString and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    connectionStringType = "Primary",
-};
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["connectionStringType"] = "Primary",
+});
+Response response = client.RenewConnectionString("<sensorPartnerId>", "<sensorId>", content);
 
-Response response = client.RenewConnectionString("<sensorPartnerId>", "<sensorId>", RequestContent.Create(data));
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call RenewConnectionString with all parameters and request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["connectionStringType"] = "Primary",
+});
+Response response = client.RenewConnectionString("<sensorPartnerId>", "<sensorId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("primaryDeviceConnectionString").ToString());
 Console.WriteLine(result.GetProperty("secondaryDeviceConnectionString").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetSensorsAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSensorsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensorsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetSensorsAsync("<sensorPartnerId>", new String[]{"<sensorDataModelIds>"}, new String[]{"<sensorMappingIds>"}, new String[]{"<deviceIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetSensorsAsync("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("sensorDataModelId").ToString());
-    Console.WriteLine(result.GetProperty("integrationId").ToString());
-    Console.WriteLine(result.GetProperty("hardwareId").ToString());
-    Console.WriteLine(result.GetProperty("deviceId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("location").GetProperty("latitude").ToString());
-    Console.WriteLine(result.GetProperty("location").GetProperty("longitude").ToString());
-    Console.WriteLine(result.GetProperty("port").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("port").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("depthInMeters")[0].ToString());
-    Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSensorsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetSensorsAsync("<sensorPartnerId>", new List<string>()
+{
+"<sensorDataModelIds>"
+}, new List<string>()
+{
+"<sensorMappingIds>"
+}, new List<string>()
+{
+"<deviceIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("sensorDataModelId").ToString());
+    Console.WriteLine(result[0].GetProperty("integrationId").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+    Console.WriteLine(result[0].GetProperty("port").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("port").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("depthInMeters")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSensors(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSensors with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSensors and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetSensors("<sensorPartnerId>", new String[]{"<sensorDataModelIds>"}, new String[]{"<sensorMappingIds>"}, new String[]{"<deviceIds>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetSensors("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("sensorDataModelId").ToString());
-    Console.WriteLine(result.GetProperty("integrationId").ToString());
-    Console.WriteLine(result.GetProperty("hardwareId").ToString());
-    Console.WriteLine(result.GetProperty("deviceId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("location").GetProperty("latitude").ToString());
-    Console.WriteLine(result.GetProperty("location").GetProperty("longitude").ToString());
-    Console.WriteLine(result.GetProperty("port").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("port").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("depthInMeters")[0].ToString());
-    Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSensors with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetSensors("<sensorPartnerId>", new List<string>()
+{
+"<sensorDataModelIds>"
+}, new List<string>()
+{
+"<sensorMappingIds>"
+}, new List<string>()
+{
+"<deviceIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("sensorDataModelId").ToString());
+    Console.WriteLine(result[0].GetProperty("integrationId").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+    Console.WriteLine(result[0].GetProperty("port").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("port").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("depthInMeters")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SolutionInference.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SolutionInference.xml
index 05d6656e96b0..257a633a9860 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SolutionInference.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/SolutionInference.xml
@@ -2,218 +2,218 @@
 <doc>
   <members>
     <member name="CancelAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CancelAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CancelAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    requestPath = "<requestPath>",
-};
-
-Response response = await client.CancelAsync("<solutionId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["requestPath"] = "<requestPath>",
+});
+Response response = await client.CancelAsync("<solutionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("<key>").ToString());
 ]]></code>
-This sample shows how to call CancelAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CancelAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
-
-var data = new {
-    requestPath = "<requestPath>",
-    partnerRequestBody = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["requestPath"] = "<requestPath>",
+    ["partnerRequestBody"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CancelAsync("<solutionId>", RequestContent.Create(data));
+});
+Response response = await client.CancelAsync("<solutionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="Cancel(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call Cancel with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call Cancel and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
-
-var data = new {
-    requestPath = "<requestPath>",
-};
+TokenCredential credential = new DefaultAzureCredential();
+SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.Cancel("<solutionId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["requestPath"] = "<requestPath>",
+});
+Response response = client.Cancel("<solutionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("<key>").ToString());
 ]]></code>
-This sample shows how to call Cancel with all parameters and request content, and how to parse the result.
+This sample shows how to call Cancel with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
-
-var data = new {
-    requestPath = "<requestPath>",
-    partnerRequestBody = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["requestPath"] = "<requestPath>",
+    ["partnerRequestBody"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.Cancel("<solutionId>", RequestContent.Create(data));
+});
+Response response = client.Cancel("<solutionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="FetchAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call FetchAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call FetchAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
-
-var data = new {
-    requestPath = "<requestPath>",
-};
+TokenCredential credential = new DefaultAzureCredential();
+SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.FetchAsync("<solutionId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["requestPath"] = "<requestPath>",
+});
+Response response = await client.FetchAsync("<solutionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("<key>").ToString());
 ]]></code>
-This sample shows how to call FetchAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call FetchAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
-
-var data = new {
-    requestPath = "<requestPath>",
-    partnerRequestBody = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["requestPath"] = "<requestPath>",
+    ["partnerRequestBody"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.FetchAsync("<solutionId>", RequestContent.Create(data));
+});
+Response response = await client.FetchAsync("<solutionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="Fetch(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call Fetch with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call Fetch and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
-
-var data = new {
-    requestPath = "<requestPath>",
-};
+TokenCredential credential = new DefaultAzureCredential();
+SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.Fetch("<solutionId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["requestPath"] = "<requestPath>",
+});
+Response response = client.Fetch("<solutionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("<key>").ToString());
 ]]></code>
-This sample shows how to call Fetch with all parameters and request content, and how to parse the result.
+This sample shows how to call Fetch with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
-
-var data = new {
-    requestPath = "<requestPath>",
-    partnerRequestBody = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["requestPath"] = "<requestPath>",
+    ["partnerRequestBody"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.Fetch("<solutionId>", RequestContent.Create(data));
+});
+Response response = client.Fetch("<solutionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
-
-var data = new {
-    requestPath = "<requestPath>",
-};
-
-var operation = await client.CreateOrUpdateAsync(WaitUntil.Completed, "<solutionId>", RequestContent.Create(data));
-
+TokenCredential credential = new DefaultAzureCredential();
+SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["requestPath"] = "<requestPath>",
+});
+Operation<BinaryData> operation = await client.CreateOrUpdateAsync(WaitUntil.Completed, "<solutionId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
-Console.WriteLine(result.GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("<key>").ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
-
-var data = new {
-    requestPath = "<requestPath>",
-    partnerRequestBody = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["requestPath"] = "<requestPath>",
+    ["partnerRequestBody"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = await client.CreateOrUpdateAsync(WaitUntil.Completed, "<solutionId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = await client.CreateOrUpdateAsync(WaitUntil.Completed, "<solutionId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
-Console.WriteLine(result.GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
-
-var data = new {
-    requestPath = "<requestPath>",
-};
-
-var operation = client.CreateOrUpdate(WaitUntil.Completed, "<solutionId>", RequestContent.Create(data));
-
+TokenCredential credential = new DefaultAzureCredential();
+SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["requestPath"] = "<requestPath>",
+});
+Operation<BinaryData> operation = client.CreateOrUpdate(WaitUntil.Completed, "<solutionId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
-Console.WriteLine(result.GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("<key>").ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
-
-var data = new {
-    requestPath = "<requestPath>",
-    partnerRequestBody = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["requestPath"] = "<requestPath>",
+    ["partnerRequestBody"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = client.CreateOrUpdate(WaitUntil.Completed, "<solutionId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = client.CreateOrUpdate(WaitUntil.Completed, "<solutionId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
-Console.WriteLine(result.GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("<key>").ToString());
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/TillageData.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/TillageData.xml
index 5296ccec4612..a40cd540d2e8 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/TillageData.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/TillageData.xml
@@ -2,13 +2,23 @@
 <doc>
   <members>
     <member name="GetTillageDataAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetTillageDataAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTillageDataAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetTillageDataAsync("<partyId>", "<tillageDataId>", new RequestContext());
+Response response = await client.GetTillageDataAsync("<partyId>", "<tillageDataId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTillageDataAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetTillageDataAsync("<partyId>", "<tillageDataId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
@@ -33,18 +43,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetTillageData(string,string,RequestContext)">
-<example>
-This sample shows how to call GetTillageData with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTillageData and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetTillageData("<partyId>", "<tillageDataId>", new RequestContext());
+Response response = client.GetTillageData("<partyId>", "<tillageDataId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTillageData with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetTillageData("<partyId>", "<tillageDataId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
@@ -69,56 +88,52 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<tillageDataId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<tillageDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    tillageDepth = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    tillagePressure = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    area = new {
-        unit = "<unit>",
-        value = 123.45d,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["tillageDepth"] = new Dictionary<string, object>()
+    {
+        ["unit"] = "<unit>",
+        ["value"] = 123.45,
     },
-    operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    associatedBoundaryId = "<associatedBoundaryId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["tillagePressure"] = null
+,
+    ["area"] = null
+,
+    ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["associatedBoundaryId"] = "<associatedBoundaryId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<tillageDataId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<tillageDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
@@ -143,56 +158,52 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<tillageDataId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<tillageDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    tillageDepth = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    tillagePressure = new {
-        unit = "<unit>",
-        value = 123.45d,
-    },
-    area = new {
-        unit = "<unit>",
-        value = 123.45d,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["tillageDepth"] = new Dictionary<string, object>()
+    {
+        ["unit"] = "<unit>",
+        ["value"] = 123.45,
     },
-    operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-    operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-    associatedBoundaryId = "<associatedBoundaryId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["tillagePressure"] = null
+,
+    ["area"] = null
+,
+    ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["associatedBoundaryId"] = "<associatedBoundaryId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-Response response = client.CreateOrUpdate("<partyId>", "<tillageDataId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate("<partyId>", "<tillageDataId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
@@ -217,42 +228,67 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<tillageDataId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<tillageDataId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<tillageDataId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<tillageDataId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -267,17 +303,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -292,167 +339,291 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAllTillageDataByPartyIdAsync(string,double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllTillageDataByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllTillageDataByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetAllTillageDataByPartyIdAsync("<partyId>", 3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetAllTillageDataByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllTillageDataByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetAllTillageDataByPartyIdAsync("<partyId>", 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllTillageDataByPartyId(string,double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllTillageDataByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllTillageDataByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetAllTillageDataByPartyId("<partyId>", 3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetAllTillageDataByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllTillageDataByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetAllTillageDataByPartyId("<partyId>", 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllTillageDataAsync(double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllTillageDataAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllTillageDataAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetAllTillageDataAsync(3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<tillageDataIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetAllTillageDataAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllTillageDataAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetAllTillageDataAsync(123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<tillageDataIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllTillageData(double?,double?,double?,double?,IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,double?,double?,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllTillageData with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllTillageData and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetAllTillageData(3.14, 3.14, 3.14, 3.14, new String[]{"<sources>"}, new String[]{"<associatedBoundaryIds>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new String[]{"<tillageDataIds>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetAllTillageData(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-    Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-    Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllTillageData with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetAllTillageData(123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<tillageDataIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+    Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<tillageDataId>", new RequestContext());
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<tillageDataId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<tillageDataId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -466,19 +637,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<tillageDataId>", new RequestContext());
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<tillageDataId>", null);
+BinaryData responseData = operation.Value;
+
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<tillageDataId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -492,8 +675,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Weather.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Weather.xml
index b9946c383064..860fca3a1114 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Weather.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Weather.xml
@@ -2,13 +2,25 @@
 <doc>
   <members>
     <member name="GetDataDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetDataDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDataDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetDataDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetDataDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("extensionId").ToString());
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("boundaryId").ToString());
+]]></code>
+This sample shows how to call GetDataDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetDataDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("extensionId").ToString());
@@ -31,18 +43,29 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetDataDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetDataDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDataDeleteJobDetails and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetDataDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetDataDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("extensionId").ToString());
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("boundaryId").ToString());
+]]></code>
+This sample shows how to call GetDataDeleteJobDetails with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetDataDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("extensionId").ToString());
@@ -65,25 +88,38 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetDataIngestionJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetDataIngestionJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDataIngestionJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetDataIngestionJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetDataIngestionJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("extensionId").ToString());
 Console.WriteLine(result.GetProperty("extensionApiName").ToString());
-Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
+]]></code>
+This sample shows how to call GetDataIngestionJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetDataIngestionJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("boundaryId").ToString());
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("extensionId").ToString());
+Console.WriteLine(result.GetProperty("extensionApiName").ToString());
+Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("extensionDataProviderAppId").ToString());
 Console.WriteLine(result.GetProperty("extensionDataProviderApiKey").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -99,25 +135,38 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetDataIngestionJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetDataIngestionJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDataIngestionJobDetails and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetDataIngestionJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("boundaryId").ToString());
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("extensionId").ToString());
+Console.WriteLine(result.GetProperty("extensionApiName").ToString());
+Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
+]]></code>
+This sample shows how to call GetDataIngestionJobDetails with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetDataIngestionJobDetails("<jobId>", new RequestContext());
+Response response = client.GetDataIngestionJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("extensionId").ToString());
 Console.WriteLine(result.GetProperty("extensionApiName").ToString());
-Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("extensionDataProviderAppId").ToString());
 Console.WriteLine(result.GetProperty("extensionDataProviderApiKey").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -133,172 +182,208 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetWeathersAsync(string,string,string,string,string,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetWeathersAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetWeathersAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetWeathersAsync("<partyId>", "<boundaryId>", "<extensionId>", "<weatherDataType>", "<granularity>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetWeathersAsync("<partyId>", "<boundaryId>", "<extensionId>", "<weatherDataType>", "<granularity>", null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("boundaryId").ToString());
-    Console.WriteLine(result.GetProperty("extensionId").ToString());
-    Console.WriteLine(result.GetProperty("location").GetProperty("latitude").ToString());
-    Console.WriteLine(result.GetProperty("location").GetProperty("longitude").ToString());
-    Console.WriteLine(result.GetProperty("dateTime").ToString());
-    Console.WriteLine(result.GetProperty("unitSystemCode").ToString());
-    Console.WriteLine(result.GetProperty("extensionVersion").ToString());
-    Console.WriteLine(result.GetProperty("weatherDataType").ToString());
-    Console.WriteLine(result.GetProperty("granularity").ToString());
-    Console.WriteLine(result.GetProperty("cloudCover").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("cloudCover").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("dewPoint").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("dewPoint").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("growingDegreeDay").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("growingDegreeDay").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("precipitation").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("precipitation").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("pressure").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("pressure").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("relativeHumidity").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("relativeHumidity").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("soilMoisture").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("soilMoisture").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("soilTemperature").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("soilTemperature").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("temperature").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("temperature").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("visibility").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("visibility").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("wetBulbTemperature").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("wetBulbTemperature").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("windChill").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("windChill").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("windDirection").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("windDirection").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("windGust").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("windGust").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("windSpeed").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("windSpeed").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("extensionId").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+    Console.WriteLine(result[0].GetProperty("dateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("extensionVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("weatherDataType").ToString());
+    Console.WriteLine(result[0].GetProperty("granularity").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetWeathersAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetWeathersAsync("<partyId>", "<boundaryId>", "<extensionId>", "<weatherDataType>", "<granularity>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("extensionId").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+    Console.WriteLine(result[0].GetProperty("dateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("unitSystemCode").ToString());
+    Console.WriteLine(result[0].GetProperty("extensionVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("weatherDataType").ToString());
+    Console.WriteLine(result[0].GetProperty("granularity").ToString());
+    Console.WriteLine(result[0].GetProperty("cloudCover").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("cloudCover").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("dewPoint").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("dewPoint").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("growingDegreeDay").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("growingDegreeDay").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("precipitation").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("precipitation").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("pressure").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("pressure").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("relativeHumidity").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("relativeHumidity").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("soilMoisture").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("soilMoisture").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("soilTemperature").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("soilTemperature").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("temperature").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("temperature").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("visibility").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("visibility").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("wetBulbTemperature").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("wetBulbTemperature").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("windChill").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("windChill").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("windDirection").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("windDirection").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("windGust").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("windGust").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("windSpeed").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("windSpeed").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetWeathers(string,string,string,string,string,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetWeathers with required parameters and parse the result.
+      <example>
+This sample shows how to call GetWeathers and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetWeathers("<partyId>", "<boundaryId>", "<extensionId>", "<weatherDataType>", "<granularity>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetWeathers("<partyId>", "<boundaryId>", "<extensionId>", "<weatherDataType>", "<granularity>", null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("boundaryId").ToString());
-    Console.WriteLine(result.GetProperty("extensionId").ToString());
-    Console.WriteLine(result.GetProperty("location").GetProperty("latitude").ToString());
-    Console.WriteLine(result.GetProperty("location").GetProperty("longitude").ToString());
-    Console.WriteLine(result.GetProperty("dateTime").ToString());
-    Console.WriteLine(result.GetProperty("unitSystemCode").ToString());
-    Console.WriteLine(result.GetProperty("extensionVersion").ToString());
-    Console.WriteLine(result.GetProperty("weatherDataType").ToString());
-    Console.WriteLine(result.GetProperty("granularity").ToString());
-    Console.WriteLine(result.GetProperty("cloudCover").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("cloudCover").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("dewPoint").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("dewPoint").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("growingDegreeDay").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("growingDegreeDay").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("precipitation").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("precipitation").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("pressure").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("pressure").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("relativeHumidity").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("relativeHumidity").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("soilMoisture").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("soilMoisture").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("soilTemperature").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("soilTemperature").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("temperature").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("temperature").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("visibility").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("visibility").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("wetBulbTemperature").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("wetBulbTemperature").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("windChill").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("windChill").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("windDirection").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("windDirection").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("windGust").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("windGust").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("windSpeed").GetProperty("unit").ToString());
-    Console.WriteLine(result.GetProperty("windSpeed").GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("extensionId").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+    Console.WriteLine(result[0].GetProperty("dateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("extensionVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("weatherDataType").ToString());
+    Console.WriteLine(result[0].GetProperty("granularity").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetWeathers with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetWeathers("<partyId>", "<boundaryId>", "<extensionId>", "<weatherDataType>", "<granularity>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+    Console.WriteLine(result[0].GetProperty("extensionId").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+    Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+    Console.WriteLine(result[0].GetProperty("dateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("unitSystemCode").ToString());
+    Console.WriteLine(result[0].GetProperty("extensionVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("weatherDataType").ToString());
+    Console.WriteLine(result[0].GetProperty("granularity").ToString());
+    Console.WriteLine(result[0].GetProperty("cloudCover").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("cloudCover").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("dewPoint").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("dewPoint").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("growingDegreeDay").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("growingDegreeDay").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("precipitation").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("precipitation").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("pressure").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("pressure").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("relativeHumidity").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("relativeHumidity").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("soilMoisture").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("soilMoisture").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("soilTemperature").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("soilTemperature").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("temperature").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("temperature").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("visibility").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("visibility").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("wetBulbTemperature").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("wetBulbTemperature").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("windChill").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("windChill").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("windDirection").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("windDirection").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("windGust").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("windGust").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("windSpeed").GetProperty("unit").ToString());
+    Console.WriteLine(result[0].GetProperty("windSpeed").GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateDataDeleteJobAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateDataDeleteJobAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateDataDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
-
-var data = new {
-    extensionId = "<extensionId>",
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-};
-
-var operation = await client.CreateDataDeleteJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["extensionId"] = "<extensionId>",
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+});
+Operation<BinaryData> operation = await client.CreateDataDeleteJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("extensionId").ToString());
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
 ]]></code>
-This sample shows how to call CreateDataDeleteJobAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateDataDeleteJobAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
-
-var data = new {
-    extensionId = "<extensionId>",
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    weatherDataType = "<weatherDataType>",
-    granularity = "<granularity>",
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    endDateTime = "2022-05-10T18:57:31.2311892Z",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
-
-var operation = await client.CreateDataDeleteJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["extensionId"] = "<extensionId>",
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["weatherDataType"] = "<weatherDataType>",
+    ["granularity"] = "<granularity>",
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Operation<BinaryData> operation = await client.CreateDataDeleteJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("extensionId").ToString());
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -320,54 +405,54 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateDataDeleteJob(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateDataDeleteJob with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateDataDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
-
-var data = new {
-    extensionId = "<extensionId>",
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-};
-
-var operation = client.CreateDataDeleteJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["extensionId"] = "<extensionId>",
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+});
+Operation<BinaryData> operation = client.CreateDataDeleteJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("extensionId").ToString());
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
 ]]></code>
-This sample shows how to call CreateDataDeleteJob with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateDataDeleteJob with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
-
-var data = new {
-    extensionId = "<extensionId>",
-    partyId = "<partyId>",
-    boundaryId = "<boundaryId>",
-    weatherDataType = "<weatherDataType>",
-    granularity = "<granularity>",
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    endDateTime = "2022-05-10T18:57:31.2311892Z",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
-
-var operation = client.CreateDataDeleteJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["extensionId"] = "<extensionId>",
+    ["partyId"] = "<partyId>",
+    ["boundaryId"] = "<boundaryId>",
+    ["weatherDataType"] = "<weatherDataType>",
+    ["granularity"] = "<granularity>",
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Operation<BinaryData> operation = client.CreateDataDeleteJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("extensionId").ToString());
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -389,68 +474,70 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateDataIngestionJobAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateDataIngestionJobAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateDataIngestionJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
-
-var data = new {
-    boundaryId = "<boundaryId>",
-    partyId = "<partyId>",
-    extensionId = "<extensionId>",
-    extensionApiName = "<extensionApiName>",
-    extensionApiInput = new {
-        key = new {},
-    },
-};
-
-var operation = await client.CreateDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["boundaryId"] = "<boundaryId>",
+    ["partyId"] = "<partyId>",
+    ["extensionId"] = "<extensionId>",
+    ["extensionApiName"] = "<extensionApiName>",
+    ["extensionApiInput"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Operation<BinaryData> operation = await client.CreateDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("extensionId").ToString());
 Console.WriteLine(result.GetProperty("extensionApiName").ToString());
-Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
 ]]></code>
-This sample shows how to call CreateDataIngestionJobAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateDataIngestionJobAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
-
-var data = new {
-    boundaryId = "<boundaryId>",
-    partyId = "<partyId>",
-    extensionId = "<extensionId>",
-    extensionApiName = "<extensionApiName>",
-    extensionApiInput = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["boundaryId"] = "<boundaryId>",
+    ["partyId"] = "<partyId>",
+    ["extensionId"] = "<extensionId>",
+    ["extensionApiName"] = "<extensionApiName>",
+    ["extensionApiInput"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-    extensionDataProviderAppId = "<extensionDataProviderAppId>",
-    extensionDataProviderApiKey = "<extensionDataProviderApiKey>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["extensionDataProviderAppId"] = "<extensionDataProviderAppId>",
+    ["extensionDataProviderApiKey"] = "<extensionDataProviderApiKey>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = await client.CreateDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = await client.CreateDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("extensionId").ToString());
 Console.WriteLine(result.GetProperty("extensionApiName").ToString());
-Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("extensionDataProviderAppId").ToString());
 Console.WriteLine(result.GetProperty("extensionDataProviderApiKey").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -466,68 +553,70 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateDataIngestionJob(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateDataIngestionJob with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateDataIngestionJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
-
-var data = new {
-    boundaryId = "<boundaryId>",
-    partyId = "<partyId>",
-    extensionId = "<extensionId>",
-    extensionApiName = "<extensionApiName>",
-    extensionApiInput = new {
-        key = new {},
-    },
-};
-
-var operation = client.CreateDataIngestionJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["boundaryId"] = "<boundaryId>",
+    ["partyId"] = "<partyId>",
+    ["extensionId"] = "<extensionId>",
+    ["extensionApiName"] = "<extensionApiName>",
+    ["extensionApiInput"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Operation<BinaryData> operation = client.CreateDataIngestionJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("extensionId").ToString());
 Console.WriteLine(result.GetProperty("extensionApiName").ToString());
-Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
 ]]></code>
-This sample shows how to call CreateDataIngestionJob with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateDataIngestionJob with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
-
-var data = new {
-    boundaryId = "<boundaryId>",
-    partyId = "<partyId>",
-    extensionId = "<extensionId>",
-    extensionApiName = "<extensionApiName>",
-    extensionApiInput = new {
-        key = new {},
+TokenCredential credential = new DefaultAzureCredential();
+Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["boundaryId"] = "<boundaryId>",
+    ["partyId"] = "<partyId>",
+    ["extensionId"] = "<extensionId>",
+    ["extensionApiName"] = "<extensionApiName>",
+    ["extensionApiInput"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-    extensionDataProviderAppId = "<extensionDataProviderAppId>",
-    extensionDataProviderApiKey = "<extensionDataProviderApiKey>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
+    ["extensionDataProviderAppId"] = "<extensionDataProviderAppId>",
+    ["extensionDataProviderApiKey"] = "<extensionDataProviderApiKey>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
-
-var operation = client.CreateDataIngestionJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = client.CreateDataIngestionJob(WaitUntil.Completed, "<jobId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("boundaryId").ToString());
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("extensionId").ToString());
 Console.WriteLine(result.GetProperty("extensionApiName").ToString());
-Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("extensionDataProviderAppId").ToString());
 Console.WriteLine(result.GetProperty("extensionDataProviderApiKey").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -543,9 +632,8 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/WeatherData.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/WeatherData.xml
index 4850b2744ad1..6bb7f849ba48 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/WeatherData.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/WeatherData.xml
@@ -2,20 +2,20 @@
 <doc>
   <members>
     <member name="GetWeatherDataAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call GetWeatherDataAsync with required request content, and how to parse the result.
+      <example>
+This sample shows how to call GetWeatherDataAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+WeatherData client = new FarmBeatsClient(credential).GetWeatherDataClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    providerApiKey = "<providerApiKey>",
-    extensionId = "<extensionId>",
-    extensionApiName = "<extensionApiName>",
-    units = "<units>",
-};
-
-Response response = await client.GetWeatherDataAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["providerApiKey"] = "<providerApiKey>",
+    ["extensionId"] = "<extensionId>",
+    ["extensionApiName"] = "<extensionApiName>",
+    ["units"] = "<units>",
+});
+Response response = await client.GetWeatherDataAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("weatherMetadata").GetProperty("extensionVersion").ToString());
@@ -24,34 +24,37 @@ Console.WriteLine(result.GetProperty("weatherMetadata").GetProperty("extensionId
 Console.WriteLine(result.GetProperty("weatherMetadata").GetProperty("extensionApiName").ToString());
 Console.WriteLine(result.GetProperty("weatherMetadata").GetProperty("units").ToString());
 ]]></code>
-This sample shows how to call GetWeatherDataAsync with all request content, and how to parse the result.
+This sample shows how to call GetWeatherDataAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+WeatherData client = new FarmBeatsClient(credential).GetWeatherDataClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    locations = new[] {
-        new {
-            type = "LatLong",
-            value = "<value>",
-        }
-    },
-    providerAppId = "<providerAppId>",
-    providerApiKey = "<providerApiKey>",
-    extensionId = "<extensionId>",
-    extensionApiName = "<extensionApiName>",
-    language = "<language>",
-    startTimeHours = 1234,
-    endTimeHours = 1234,
-    duration = 1234,
-    units = "<units>",
-    additionalParams = new {
-        iconResolution = "<iconResolution>",
-        details = true,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["locations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "LatLong",
+["value"] = "<value>",
+}
+},
+    ["providerAppId"] = "<providerAppId>",
+    ["providerApiKey"] = "<providerApiKey>",
+    ["extensionId"] = "<extensionId>",
+    ["extensionApiName"] = "<extensionApiName>",
+    ["language"] = "<language>",
+    ["startTimeHours"] = 1234,
+    ["endTimeHours"] = 1234,
+    ["duration"] = 1234,
+    ["units"] = "<units>",
+    ["additionalParams"] = new Dictionary<string, object>()
+    {
+        ["iconResolution"] = "<iconResolution>",
+        ["details"] = true,
     },
-};
-
-Response response = await client.GetWeatherDataAsync(RequestContent.Create(data));
+});
+Response response = await client.GetWeatherDataAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("weatherMetadata").GetProperty("extensionVersion").ToString());
@@ -108,30 +111,29 @@ Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProp
 Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("windSpeed").GetProperty("values")[0].ToString());
 Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("wxPhraseLong")[0].ToString());
 Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("wxPhraseShort")[0].ToString());
-Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("additionalAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("additionalAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("location").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("location").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("retryable").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetWeatherData(RequestContent,RequestContext)">
-<example>
-This sample shows how to call GetWeatherData with required request content, and how to parse the result.
+      <example>
+This sample shows how to call GetWeatherData and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+WeatherData client = new FarmBeatsClient(credential).GetWeatherDataClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    providerApiKey = "<providerApiKey>",
-    extensionId = "<extensionId>",
-    extensionApiName = "<extensionApiName>",
-    units = "<units>",
-};
-
-Response response = client.GetWeatherData(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["providerApiKey"] = "<providerApiKey>",
+    ["extensionId"] = "<extensionId>",
+    ["extensionApiName"] = "<extensionApiName>",
+    ["units"] = "<units>",
+});
+Response response = client.GetWeatherData(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("weatherMetadata").GetProperty("extensionVersion").ToString());
@@ -140,34 +142,37 @@ Console.WriteLine(result.GetProperty("weatherMetadata").GetProperty("extensionId
 Console.WriteLine(result.GetProperty("weatherMetadata").GetProperty("extensionApiName").ToString());
 Console.WriteLine(result.GetProperty("weatherMetadata").GetProperty("units").ToString());
 ]]></code>
-This sample shows how to call GetWeatherData with all request content, and how to parse the result.
+This sample shows how to call GetWeatherData with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetWeatherDataClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+WeatherData client = new FarmBeatsClient(credential).GetWeatherDataClient(apiVersion: "2022-11-01-preview");
 
-var data = new {
-    locations = new[] {
-        new {
-            type = "LatLong",
-            value = "<value>",
-        }
-    },
-    providerAppId = "<providerAppId>",
-    providerApiKey = "<providerApiKey>",
-    extensionId = "<extensionId>",
-    extensionApiName = "<extensionApiName>",
-    language = "<language>",
-    startTimeHours = 1234,
-    endTimeHours = 1234,
-    duration = 1234,
-    units = "<units>",
-    additionalParams = new {
-        iconResolution = "<iconResolution>",
-        details = true,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["locations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "LatLong",
+["value"] = "<value>",
+}
+},
+    ["providerAppId"] = "<providerAppId>",
+    ["providerApiKey"] = "<providerApiKey>",
+    ["extensionId"] = "<extensionId>",
+    ["extensionApiName"] = "<extensionApiName>",
+    ["language"] = "<language>",
+    ["startTimeHours"] = 1234,
+    ["endTimeHours"] = 1234,
+    ["duration"] = 1234,
+    ["units"] = "<units>",
+    ["additionalParams"] = new Dictionary<string, object>()
+    {
+        ["iconResolution"] = "<iconResolution>",
+        ["details"] = true,
     },
-};
-
-Response response = client.GetWeatherData(RequestContent.Create(data));
+});
+Response response = client.GetWeatherData(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("weatherMetadata").GetProperty("extensionVersion").ToString());
@@ -224,14 +229,13 @@ Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProp
 Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("windSpeed").GetProperty("values")[0].ToString());
 Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("wxPhraseLong")[0].ToString());
 Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("wxPhraseShort")[0].ToString());
-Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("additionalAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("additionalAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("location").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("location").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("retryable").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Zones.xml b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Zones.xml
index 14a880b453df..6346b916a26f 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Zones.xml
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/src/Generated/Docs/Zones.xml
@@ -2,13 +2,23 @@
 <doc>
   <members>
     <member name="GetZoneAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetZoneAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetZoneAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetZoneAsync("<partyId>", "<zoneId>", new RequestContext());
+Response response = await client.GetZoneAsync("<partyId>", "<zoneId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetZoneAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetZoneAsync("<partyId>", "<zoneId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -24,18 +34,27 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetZone(string,string,RequestContext)">
-<example>
-This sample shows how to call GetZone with required parameters and parse the result.
+      <example>
+This sample shows how to call GetZone and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetZone("<partyId>", "<zoneId>", new RequestContext());
+Response response = client.GetZone("<partyId>", "<zoneId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetZone with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetZone("<partyId>", "<zoneId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -51,42 +70,41 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
-
-var data = new {};
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<zoneId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<zoneId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
-
-var data = new {
-    type = "<type>",
-    managementZoneId = "<managementZoneId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.CreateOrUpdateAsync("<partyId>", "<zoneId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["type"] = "<type>",
+    ["managementZoneId"] = "<managementZoneId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = await client.CreateOrUpdateAsync("<partyId>", "<zoneId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -102,42 +120,41 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-var data = new {};
-
-Response response = client.CreateOrUpdate("<partyId>", "<zoneId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate("<partyId>", "<zoneId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
-
-var data = new {
-    type = "<type>",
-    managementZoneId = "<managementZoneId>",
-    status = "<status>",
-    source = "<source>",
-    name = "<name>",
-    description = "<description>",
-    properties = new {
-        key = new {},
-    },
-};
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.CreateOrUpdate("<partyId>", "<zoneId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["type"] = "<type>",
+    ["managementZoneId"] = "<managementZoneId>",
+    ["status"] = "<status>",
+    ["source"] = "<source>",
+    ["name"] = "<name>",
+    ["description"] = "<description>",
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
+    },
+});
+Response response = client.CreateOrUpdate("<partyId>", "<zoneId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -153,42 +170,67 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
 Response response = await client.DeleteAsync("<partyId>", "<zoneId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.DeleteAsync("<partyId>", "<zoneId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
 Response response = client.Delete("<partyId>", "<zoneId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.Delete("<partyId>", "<zoneId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
+
+Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -203,17 +245,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCascadeDeleteJobDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetCascadeDeleteJobDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCascadeDeleteJobDetails and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call GetCascadeDeleteJobDetails with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
+
+Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -228,131 +281,267 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetZonesByPartyIdAsync(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetZonesByPartyIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetZonesByPartyIdAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetZonesByPartyIdAsync("<partyId>", new String[]{"<types>"}, new String[]{"<managementZoneIds>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetZonesByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("managementZoneId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetZonesByPartyIdAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetZonesByPartyIdAsync("<partyId>", new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<managementZoneIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("managementZoneId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetZonesByPartyId(string,IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetZonesByPartyId with required parameters and parse the result.
+      <example>
+This sample shows how to call GetZonesByPartyId and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetZonesByPartyId("<partyId>", new String[]{"<types>"}, new String[]{"<managementZoneIds>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetZonesByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("managementZoneId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetZonesByPartyId with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetZonesByPartyId("<partyId>", new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<managementZoneIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("managementZoneId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetZonesAsync(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetZonesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetZonesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-await foreach (var item in client.GetZonesAsync(new String[]{"<types>"}, new String[]{"<managementZoneIds>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetZonesAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("managementZoneId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetZonesAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
+
+await foreach (BinaryData item in client.GetZonesAsync(new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<managementZoneIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("managementZoneId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetZones(IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},IEnumerable{string},DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,DateTimeOffset?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetZones with required parameters and parse the result.
+      <example>
+This sample shows how to call GetZones and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-foreach (var item in client.GetZones(new String[]{"<types>"}, new String[]{"<managementZoneIds>"}, new String[]{"<sources>"}, new String[]{"<ids>"}, new String[]{"<names>"}, new String[]{"<propertyFilters>"}, new String[]{"<statuses>"}, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetZones(null, null, null, null, null, null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("partyId").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("managementZoneId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("eTag").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetZones with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
+
+foreach (BinaryData item in client.GetZones(new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<managementZoneIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("partyId").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("managementZoneId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("eTag").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJobAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJobAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<zoneId>", new RequestContext());
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<zoneId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJobAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
+
+Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<zoneId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -366,19 +555,31 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateCascadeDeleteJob(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call CreateCascadeDeleteJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateCascadeDeleteJob and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<zoneId>", new RequestContext());
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<zoneId>", null);
+BinaryData responseData = operation.Value;
+
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("partyId").ToString());
+Console.WriteLine(result.GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("resourceType").ToString());
+]]></code>
+This sample shows how to call CreateCascadeDeleteJob with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
+Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<zoneId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("partyId").ToString());
 Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -392,8 +593,7 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("endTime").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ApplicationData.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ApplicationData.cs
index afcf5684342c..89780b051b85 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ApplicationData.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ApplicationData.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_ApplicationData
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -38,10 +38,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -62,10 +62,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -77,10 +77,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -101,10 +101,10 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetApplicationData()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetApplicationData("<partyId>", "<applicationDataId>", new RequestContext());
+            Response response = client.GetApplicationData("<partyId>", "<applicationDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -114,10 +114,10 @@ public void Example_GetApplicationData()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetApplicationData_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetApplicationData("<partyId>", "<applicationDataId>", new RequestContext());
+            Response response = client.GetApplicationData("<partyId>", "<applicationDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
@@ -148,17 +148,17 @@ public void Example_GetApplicationData_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetApplicationData_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetApplicationDataAsync("<partyId>", "<applicationDataId>", new RequestContext());
+            Response response = await client.GetApplicationDataAsync("<partyId>", "<applicationDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -168,10 +168,10 @@ public async Task Example_GetApplicationData_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetApplicationData_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetApplicationDataAsync("<partyId>", "<applicationDataId>", new RequestContext());
+            Response response = await client.GetApplicationDataAsync("<partyId>", "<applicationDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
@@ -202,19 +202,18 @@ public async Task Example_GetApplicationData_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<applicationDataId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<applicationDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -224,55 +223,46 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                applicationProductDetails = new[] {
-        new {
-            productName = "<productName>",
-            isCarrier = true,
-            avgMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-        }
-    },
-                avgMaterial = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                totalMaterial = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                area = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                associatedBoundaryId = "<associatedBoundaryId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["applicationProductDetails"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["productName"] = "<productName>",
+["isCarrier"] = true,
+["avgMaterial"] = new Dictionary<string, object>()
+{
+["unit"] = "<unit>",
+["value"] = 123.45,
+},
+["totalMaterial"] = null
+,
+}
+},
+                ["avgMaterial"] = null
+            ,
+                ["totalMaterial"] = null
+            ,
+                ["area"] = null
+            ,
+                ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["associatedBoundaryId"] = "<associatedBoundaryId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<applicationDataId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<applicationDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
@@ -303,19 +293,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<applicationDataId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<applicationDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -325,55 +314,46 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                applicationProductDetails = new[] {
-        new {
-            productName = "<productName>",
-            isCarrier = true,
-            avgMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-        }
-    },
-                avgMaterial = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                totalMaterial = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                area = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                associatedBoundaryId = "<associatedBoundaryId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["applicationProductDetails"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["productName"] = "<productName>",
+["isCarrier"] = true,
+["avgMaterial"] = new Dictionary<string, object>()
+{
+["unit"] = "<unit>",
+["value"] = 123.45,
+},
+["totalMaterial"] = null
+,
+}
+},
+                ["avgMaterial"] = null
+            ,
+                ["totalMaterial"] = null
+            ,
+                ["area"] = null
+            ,
+                ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["associatedBoundaryId"] = "<associatedBoundaryId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<applicationDataId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<applicationDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
@@ -404,15 +384,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<applicationDataId>");
             Console.WriteLine(response.Status);
@@ -422,8 +402,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<applicationDataId>");
             Console.WriteLine(response.Status);
@@ -433,8 +413,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<applicationDataId>");
             Console.WriteLine(response.Status);
@@ -444,8 +424,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<applicationDataId>");
             Console.WriteLine(response.Status);
@@ -455,13 +435,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllApplicationData()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllApplicationData(3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<applicationIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllApplicationData(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -469,41 +449,59 @@ public void Example_GetAllApplicationData()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllApplicationData_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllApplicationData(3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<applicationIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllApplicationData(123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<applicationIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -511,13 +509,13 @@ public void Example_GetAllApplicationData_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllApplicationData_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllApplicationDataAsync(3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<applicationIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllApplicationDataAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -525,41 +523,59 @@ public async Task Example_GetAllApplicationData_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllApplicationData_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllApplicationDataAsync(3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<applicationIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllApplicationDataAsync(123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<applicationIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -567,13 +583,13 @@ public async Task Example_GetAllApplicationData_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllApplicationDataByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllApplicationDataByPartyId("<partyId>", 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllApplicationDataByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -581,41 +597,59 @@ public void Example_GetAllApplicationDataByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllApplicationDataByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllApplicationDataByPartyId("<partyId>", 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllApplicationDataByPartyId("<partyId>", 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -623,13 +657,13 @@ public void Example_GetAllApplicationDataByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllApplicationDataByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllApplicationDataByPartyIdAsync("<partyId>", 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllApplicationDataByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -637,41 +671,59 @@ public async Task Example_GetAllApplicationDataByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllApplicationDataByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllApplicationDataByPartyIdAsync("<partyId>", 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllApplicationDataByPartyIdAsync("<partyId>", 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("isCarrier").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("applicationProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -679,12 +731,12 @@ public async Task Example_GetAllApplicationDataByPartyId_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<applicationDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<applicationDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -695,12 +747,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<applicationDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<applicationDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -720,12 +772,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<applicationDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<applicationDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -736,12 +788,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetApplicationDataClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<applicationDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            ApplicationData client = new FarmBeatsClient(credential).GetApplicationDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<applicationDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Attachments.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Attachments.cs
index 1c7cd08baa11..258bb901e0cf 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Attachments.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Attachments.cs
@@ -13,6 +13,7 @@
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +24,10 @@ internal class Samples_Attachments
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAttachment()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetAttachment("<partyId>", "<attachmentId>", new RequestContext());
+            Response response = client.GetAttachment("<partyId>", "<attachmentId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,10 +37,10 @@ public void Example_GetAttachment()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAttachment_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetAttachment("<partyId>", "<attachmentId>", new RequestContext());
+            Response response = client.GetAttachment("<partyId>", "<attachmentId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -62,10 +63,10 @@ public void Example_GetAttachment_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAttachment_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetAttachmentAsync("<partyId>", "<attachmentId>", new RequestContext());
+            Response response = await client.GetAttachmentAsync("<partyId>", "<attachmentId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -75,10 +76,10 @@ public async Task Example_GetAttachment_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAttachment_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetAttachmentAsync("<partyId>", "<attachmentId>", new RequestContext());
+            Response response = await client.GetAttachmentAsync("<partyId>", "<attachmentId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -101,12 +102,11 @@ public async Task Example_GetAttachment_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            var data = File.OpenRead("<filePath>");
-
-            Response response = client.CreateOrUpdate("<partyId>", "<attachmentId>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.CreateOrUpdate("<partyId>", "<attachmentId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -116,12 +116,11 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
-
-            var data = File.OpenRead("<filePath>");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.CreateOrUpdate("<partyId>", "<attachmentId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = client.CreateOrUpdate("<partyId>", "<attachmentId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -144,12 +143,11 @@ public void Example_CreateOrUpdate_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            var data = File.OpenRead("<filePath>");
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<attachmentId>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<attachmentId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -159,12 +157,11 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
-
-            var data = File.OpenRead("<filePath>");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<attachmentId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<attachmentId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -187,8 +184,8 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<attachmentId>");
             Console.WriteLine(response.Status);
@@ -198,8 +195,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<attachmentId>");
             Console.WriteLine(response.Status);
@@ -209,8 +206,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<attachmentId>");
             Console.WriteLine(response.Status);
@@ -220,8 +217,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<attachmentId>");
             Console.WriteLine(response.Status);
@@ -231,13 +228,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_Download()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.Download("<partyId>", "<attachmentId>", new RequestContext());
+            Response response = client.Download("<partyId>", "<attachmentId>", null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -248,13 +245,13 @@ public void Example_Download()
         [Ignore("Only validating compilation of examples")]
         public void Example_Download_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.Download("<partyId>", "<attachmentId>", new RequestContext());
+            Response response = client.Download("<partyId>", "<attachmentId>", null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -265,13 +262,13 @@ public void Example_Download_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Download_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.DownloadAsync("<partyId>", "<attachmentId>", new RequestContext());
+            Response response = await client.DownloadAsync("<partyId>", "<attachmentId>", null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -282,13 +279,13 @@ public async Task Example_Download_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Download_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.DownloadAsync("<partyId>", "<attachmentId>", new RequestContext());
+            Response response = await client.DownloadAsync("<partyId>", "<attachmentId>", null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -299,13 +296,13 @@ public async Task Example_Download_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAttachmentsByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAttachmentsByPartyId("<partyId>", new string[] { "<resourceIds>" }, new string[] { "<resourceTypes>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAttachmentsByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -313,26 +310,44 @@ public void Example_GetAttachmentsByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAttachmentsByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAttachmentsByPartyId("<partyId>", new string[] { "<resourceIds>" }, new string[] { "<resourceTypes>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAttachmentsByPartyId("<partyId>", new List<string>()
+{
+"<resourceIds>"
+}, new List<string>()
+{
+"<resourceTypes>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("resourceId").ToString());
-                Console.WriteLine(result.GetProperty("resourceType").ToString());
-                Console.WriteLine(result.GetProperty("originalFileName").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceType").ToString());
+                Console.WriteLine(result[0].GetProperty("originalFileName").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
             }
         }
 
@@ -340,13 +355,13 @@ public void Example_GetAttachmentsByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAttachmentsByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAttachmentsByPartyIdAsync("<partyId>", new string[] { "<resourceIds>" }, new string[] { "<resourceTypes>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAttachmentsByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -354,26 +369,44 @@ public async Task Example_GetAttachmentsByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAttachmentsByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Attachments client = new FarmBeatsClient(credential).GetAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAttachmentsByPartyIdAsync("<partyId>", new string[] { "<resourceIds>" }, new string[] { "<resourceTypes>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAttachmentsByPartyIdAsync("<partyId>", new List<string>()
+{
+"<resourceIds>"
+}, new List<string>()
+{
+"<resourceTypes>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("resourceId").ToString());
-                Console.WriteLine(result.GetProperty("resourceType").ToString());
-                Console.WriteLine(result.GetProperty("originalFileName").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceType").ToString());
+                Console.WriteLine(result[0].GetProperty("originalFileName").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
             }
         }
     }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Boundaries.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Boundaries.cs
index 5f5e80e90866..4572f862eb2f 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Boundaries.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Boundaries.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_Boundaries
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -38,10 +38,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -62,10 +62,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -77,10 +77,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -101,12 +101,11 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<boundaryId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<boundaryId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -116,69 +115,50 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                geometry = new
-                {
-                    coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-                    type = "MultiPolygon",
-                },
-                type = "<type>",
-                centroid = new
+                ["geometry"] = new Dictionary<string, object>()
                 {
-                    coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-                    type = "MultiPolygon",
-                },
-                bbox = new
-                {
-                    coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-                    type = "MultiPolygon",
+                    ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+                    ["type"] = "MultiPolygon",
                 },
-                parentId = "<parentId>",
-                area = new
+                ["type"] = "<type>",
+                ["centroid"] = null
+            ,
+                ["bbox"] = null
+            ,
+                ["parentId"] = "<parentId>",
+                ["area"] = new Dictionary<string, object>()
                 {
-                    unit = "<unit>",
-                    value = 123.45d,
+                    ["unit"] = "<unit>",
+                    ["value"] = 123.45,
                 },
-                parentType = "Field",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["parentType"] = "Field",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<boundaryId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<boundaryId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("geometry").GetProperty("type").ToString());
@@ -201,19 +181,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<boundaryId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<boundaryId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -223,69 +202,50 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                geometry = new
-                {
-                    coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-                    type = "MultiPolygon",
-                },
-                type = "<type>",
-                centroid = new
-                {
-                    coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-                    type = "MultiPolygon",
-                },
-                bbox = new
+                ["geometry"] = new Dictionary<string, object>()
                 {
-                    coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-                    type = "MultiPolygon",
+                    ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+                    ["type"] = "MultiPolygon",
                 },
-                parentId = "<parentId>",
-                area = new
+                ["type"] = "<type>",
+                ["centroid"] = null
+            ,
+                ["bbox"] = null
+            ,
+                ["parentId"] = "<parentId>",
+                ["area"] = new Dictionary<string, object>()
                 {
-                    unit = "<unit>",
-                    value = 123.45d,
+                    ["unit"] = "<unit>",
+                    ["value"] = 123.45,
                 },
-                parentType = "Field",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["parentType"] = "Field",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<boundaryId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<boundaryId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("geometry").GetProperty("type").ToString());
@@ -308,17 +268,17 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBoundary()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetBoundary("<partyId>", "<boundaryId>", new RequestContext());
+            Response response = client.GetBoundary("<partyId>", "<boundaryId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -328,10 +288,10 @@ public void Example_GetBoundary()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBoundary_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetBoundary("<partyId>", "<boundaryId>", new RequestContext());
+            Response response = client.GetBoundary("<partyId>", "<boundaryId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("geometry").GetProperty("type").ToString());
@@ -354,17 +314,17 @@ public void Example_GetBoundary_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBoundary_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetBoundaryAsync("<partyId>", "<boundaryId>", new RequestContext());
+            Response response = await client.GetBoundaryAsync("<partyId>", "<boundaryId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -374,10 +334,10 @@ public async Task Example_GetBoundary_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBoundary_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetBoundaryAsync("<partyId>", "<boundaryId>", new RequestContext());
+            Response response = await client.GetBoundaryAsync("<partyId>", "<boundaryId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("geometry").GetProperty("type").ToString());
@@ -400,15 +360,15 @@ public async Task Example_GetBoundary_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<boundaryId>");
             Console.WriteLine(response.Status);
@@ -418,8 +378,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<boundaryId>");
             Console.WriteLine(response.Status);
@@ -429,8 +389,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<boundaryId>");
             Console.WriteLine(response.Status);
@@ -440,8 +400,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<boundaryId>");
             Console.WriteLine(response.Status);
@@ -451,10 +411,10 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOverlap()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetOverlap("<partyId>", "<boundaryId>", "<otherPartyId>", "<otherBoundaryId>", new RequestContext());
+            Response response = client.GetOverlap("<partyId>", "<boundaryId>", "<otherPartyId>", "<otherBoundaryId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -464,10 +424,10 @@ public void Example_GetOverlap()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOverlap_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetOverlap("<partyId>", "<boundaryId>", "<otherPartyId>", "<otherBoundaryId>", new RequestContext());
+            Response response = client.GetOverlap("<partyId>", "<boundaryId>", "<otherPartyId>", "<otherBoundaryId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("boundaryArea").ToString());
@@ -479,10 +439,10 @@ public void Example_GetOverlap_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOverlap_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetOverlapAsync("<partyId>", "<boundaryId>", "<otherPartyId>", "<otherBoundaryId>", new RequestContext());
+            Response response = await client.GetOverlapAsync("<partyId>", "<boundaryId>", "<otherPartyId>", "<otherBoundaryId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -492,10 +452,10 @@ public async Task Example_GetOverlap_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOverlap_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetOverlapAsync("<partyId>", "<boundaryId>", "<otherPartyId>", "<otherBoundaryId>", new RequestContext());
+            Response response = await client.GetOverlapAsync("<partyId>", "<boundaryId>", "<otherPartyId>", "<otherBoundaryId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("boundaryArea").ToString());
@@ -507,13 +467,13 @@ public async Task Example_GetOverlap_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBoundaries()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetBoundaries("<parentType>", "<type>", new string[] { "<parentIds>" }, 3.14, 3.14, new string[] { "<boundaryIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetBoundaries(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -521,29 +481,44 @@ public void Example_GetBoundaries()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBoundaries_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetBoundaries("<parentType>", "<type>", new string[] { "<parentIds>" }, 3.14, 3.14, new string[] { "<boundaryIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetBoundaries("<parentType>", "<type>", new List<string>()
+{
+"<parentIds>"
+}, 123.45, 123.45, new List<string>()
+{
+"<boundaryIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("parentType").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("parentType").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -551,13 +526,13 @@ public void Example_GetBoundaries_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBoundaries_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetBoundariesAsync("<parentType>", "<type>", new string[] { "<parentIds>" }, 3.14, 3.14, new string[] { "<boundaryIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetBoundariesAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -565,29 +540,44 @@ public async Task Example_GetBoundaries_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBoundaries_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetBoundariesAsync("<parentType>", "<type>", new string[] { "<parentIds>" }, 3.14, 3.14, new string[] { "<boundaryIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetBoundariesAsync("<parentType>", "<type>", new List<string>()
+{
+"<parentIds>"
+}, 123.45, 123.45, new List<string>()
+{
+"<boundaryIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("parentType").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("parentType").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -595,15 +585,14 @@ public async Task Example_GetBoundaries_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_Search()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            foreach (var item in client.Search(RequestContent.Create(data)))
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            foreach (BinaryData item in client.Search(content))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -611,71 +600,79 @@ public void Example_Search()
         [Ignore("Only validating compilation of examples")]
         public void Example_Search_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                ids = new[] {
-        "<String>"
-    },
-                names = new[] {
-        "<String>"
-    },
-                propertyFilters = new[] {
-        "<String>"
-    },
-                statuses = new[] {
-        "<String>"
-    },
-                minCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-                maxCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-                minLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                maxLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                maxPageSize = 1234,
-                skipToken = "<skipToken>",
-                parentType = "Field",
-                type = "<type>",
-                parentIds = new[] {
-        "<String>"
-    },
-                minArea = 123.45d,
-                maxArea = 123.45d,
-                intersectsWithGeometry = new
+                ["ids"] = new List<object>()
+{
+"<ids>"
+},
+                ["names"] = new List<object>()
+{
+"<names>"
+},
+                ["propertyFilters"] = new List<object>()
+{
+"<propertyFilters>"
+},
+                ["statuses"] = new List<object>()
+{
+"<statuses>"
+},
+                ["minCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["maxCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["minLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["maxLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["maxPageSize"] = 1234,
+                ["skipToken"] = "<skipToken>",
+                ["parentType"] = "Field",
+                ["type"] = "<type>",
+                ["parentIds"] = new List<object>()
+{
+"<parentIds>"
+},
+                ["minArea"] = 123.45,
+                ["maxArea"] = 123.45,
+                ["intersectsWithGeometry"] = new Dictionary<string, object>()
                 {
-                    coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-                    type = "MultiPolygon",
+                    ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+                    ["type"] = "MultiPolygon",
                 },
-            };
-
-            foreach (var item in client.Search(RequestContent.Create(data)))
+            });
+            foreach (BinaryData item in client.Search(content))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("parentType").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("parentType").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -683,15 +680,14 @@ public void Example_Search_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Search_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            await foreach (var item in client.SearchAsync(RequestContent.Create(data)))
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            await foreach (BinaryData item in client.SearchAsync(content))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -699,71 +695,79 @@ public async Task Example_Search_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Search_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                ids = new[] {
-        "<String>"
-    },
-                names = new[] {
-        "<String>"
-    },
-                propertyFilters = new[] {
-        "<String>"
-    },
-                statuses = new[] {
-        "<String>"
-    },
-                minCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-                maxCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-                minLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                maxLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                maxPageSize = 1234,
-                skipToken = "<skipToken>",
-                parentType = "Field",
-                type = "<type>",
-                parentIds = new[] {
-        "<String>"
-    },
-                minArea = 123.45d,
-                maxArea = 123.45d,
-                intersectsWithGeometry = new
+                ["ids"] = new List<object>()
+{
+"<ids>"
+},
+                ["names"] = new List<object>()
+{
+"<names>"
+},
+                ["propertyFilters"] = new List<object>()
+{
+"<propertyFilters>"
+},
+                ["statuses"] = new List<object>()
+{
+"<statuses>"
+},
+                ["minCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["maxCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["minLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["maxLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["maxPageSize"] = 1234,
+                ["skipToken"] = "<skipToken>",
+                ["parentType"] = "Field",
+                ["type"] = "<type>",
+                ["parentIds"] = new List<object>()
+{
+"<parentIds>"
+},
+                ["minArea"] = 123.45,
+                ["maxArea"] = 123.45,
+                ["intersectsWithGeometry"] = new Dictionary<string, object>()
                 {
-                    coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-                    type = "MultiPolygon",
+                    ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+                    ["type"] = "MultiPolygon",
                 },
-            };
-
-            await foreach (var item in client.SearchAsync(RequestContent.Create(data)))
+            });
+            await foreach (BinaryData item in client.SearchAsync(content))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("parentType").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("parentType").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -771,13 +775,13 @@ public async Task Example_Search_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBoundariesByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetBoundariesByPartyId("<partyId>", "<parentType>", "<type>", new string[] { "<parentIds>" }, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetBoundariesByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -785,29 +789,44 @@ public void Example_GetBoundariesByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBoundariesByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetBoundariesByPartyId("<partyId>", "<parentType>", "<type>", new string[] { "<parentIds>" }, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetBoundariesByPartyId("<partyId>", "<parentType>", "<type>", new List<string>()
+{
+"<parentIds>"
+}, 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("parentType").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("parentType").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -815,13 +834,13 @@ public void Example_GetBoundariesByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBoundariesByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetBoundariesByPartyIdAsync("<partyId>", "<parentType>", "<type>", new string[] { "<parentIds>" }, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetBoundariesByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -829,29 +848,44 @@ public async Task Example_GetBoundariesByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBoundariesByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetBoundariesByPartyIdAsync("<partyId>", "<parentType>", "<type>", new string[] { "<parentIds>" }, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetBoundariesByPartyIdAsync("<partyId>", "<parentType>", "<type>", new List<string>()
+{
+"<parentIds>"
+}, 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("parentType").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("parentType").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -859,15 +893,14 @@ public async Task Example_GetBoundariesByPartyId_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_SearchByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.SearchByPartyId("<partyId>", RequestContent.Create(data)))
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            foreach (BinaryData item in client.SearchByPartyId("<partyId>", content))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -875,71 +908,79 @@ public void Example_SearchByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_SearchByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                ids = new[] {
-        "<String>"
-    },
-                names = new[] {
-        "<String>"
-    },
-                propertyFilters = new[] {
-        "<String>"
-    },
-                statuses = new[] {
-        "<String>"
-    },
-                minCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-                maxCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-                minLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                maxLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                maxPageSize = 1234,
-                skipToken = "<skipToken>",
-                parentType = "Field",
-                type = "<type>",
-                parentIds = new[] {
-        "<String>"
-    },
-                minArea = 123.45d,
-                maxArea = 123.45d,
-                intersectsWithGeometry = new
+                ["ids"] = new List<object>()
+{
+"<ids>"
+},
+                ["names"] = new List<object>()
+{
+"<names>"
+},
+                ["propertyFilters"] = new List<object>()
+{
+"<propertyFilters>"
+},
+                ["statuses"] = new List<object>()
+{
+"<statuses>"
+},
+                ["minCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["maxCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["minLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["maxLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["maxPageSize"] = 1234,
+                ["skipToken"] = "<skipToken>",
+                ["parentType"] = "Field",
+                ["type"] = "<type>",
+                ["parentIds"] = new List<object>()
+{
+"<parentIds>"
+},
+                ["minArea"] = 123.45,
+                ["maxArea"] = 123.45,
+                ["intersectsWithGeometry"] = new Dictionary<string, object>()
                 {
-                    coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-                    type = "MultiPolygon",
+                    ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+                    ["type"] = "MultiPolygon",
                 },
-            };
-
-            foreach (var item in client.SearchByPartyId("<partyId>", RequestContent.Create(data)))
+            });
+            foreach (BinaryData item in client.SearchByPartyId("<partyId>", content))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("parentType").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("parentType").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -947,15 +988,14 @@ public void Example_SearchByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SearchByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.SearchByPartyIdAsync("<partyId>", RequestContent.Create(data)))
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            await foreach (BinaryData item in client.SearchByPartyIdAsync("<partyId>", content))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -963,71 +1003,79 @@ public async Task Example_SearchByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SearchByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                ids = new[] {
-        "<String>"
-    },
-                names = new[] {
-        "<String>"
-    },
-                propertyFilters = new[] {
-        "<String>"
-    },
-                statuses = new[] {
-        "<String>"
-    },
-                minCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-                maxCreatedDateTime = "2022-05-10T18:57:31.2311892Z",
-                minLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                maxLastModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                maxPageSize = 1234,
-                skipToken = "<skipToken>",
-                parentType = "Field",
-                type = "<type>",
-                parentIds = new[] {
-        "<String>"
-    },
-                minArea = 123.45d,
-                maxArea = 123.45d,
-                intersectsWithGeometry = new
+                ["ids"] = new List<object>()
+{
+"<ids>"
+},
+                ["names"] = new List<object>()
+{
+"<names>"
+},
+                ["propertyFilters"] = new List<object>()
+{
+"<propertyFilters>"
+},
+                ["statuses"] = new List<object>()
+{
+"<statuses>"
+},
+                ["minCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["maxCreatedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["minLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["maxLastModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["maxPageSize"] = 1234,
+                ["skipToken"] = "<skipToken>",
+                ["parentType"] = "Field",
+                ["type"] = "<type>",
+                ["parentIds"] = new List<object>()
+{
+"<parentIds>"
+},
+                ["minArea"] = 123.45,
+                ["maxArea"] = 123.45,
+                ["intersectsWithGeometry"] = new Dictionary<string, object>()
                 {
-                    coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-                    type = "MultiPolygon",
+                    ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+                    ["type"] = "MultiPolygon",
                 },
-            };
-
-            await foreach (var item in client.SearchByPartyIdAsync("<partyId>", RequestContent.Create(data)))
+            });
+            await foreach (BinaryData item in client.SearchByPartyIdAsync("<partyId>", content))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("parentType").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("parentType").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -1035,12 +1083,12 @@ public async Task Example_SearchByPartyId_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<boundaryId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<boundaryId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -1051,12 +1099,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<boundaryId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<boundaryId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -1076,12 +1124,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<boundaryId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<boundaryId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -1092,12 +1140,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetBoundariesClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<boundaryId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Boundaries client = new FarmBeatsClient(credential).GetBoundariesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<boundaryId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_CropProducts.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_CropProducts.cs
index acef7352a520..c1f9fe5d23eb 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_CropProducts.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_CropProducts.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_CropProducts
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCropProduct()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCropProduct("<cropProductId>", new RequestContext());
+            Response response = client.GetCropProduct("<cropProductId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,10 +36,10 @@ public void Example_GetCropProduct()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCropProduct_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCropProduct("<cropProductId>", new RequestContext());
+            Response response = client.GetCropProduct("<cropProductId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("cropIds")[0].ToString());
@@ -59,17 +59,17 @@ public void Example_GetCropProduct_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCropProduct_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCropProductAsync("<cropProductId>", new RequestContext());
+            Response response = await client.GetCropProductAsync("<cropProductId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -79,10 +79,10 @@ public async Task Example_GetCropProduct_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCropProduct_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCropProductAsync("<cropProductId>", new RequestContext());
+            Response response = await client.GetCropProductAsync("<cropProductId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("cropIds")[0].ToString());
@@ -102,19 +102,18 @@ public async Task Example_GetCropProduct_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<cropProductId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<cropProductId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -124,36 +123,37 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                cropIds = new[] {
-        "<String>"
-    },
-                brand = "<brand>",
-                product = "<product>",
-                trait = "<trait>",
-                relativeMaturity = new
+                ["cropIds"] = new List<object>()
+{
+"<cropIds>"
+},
+                ["brand"] = "<brand>",
+                ["product"] = "<product>",
+                ["trait"] = "<trait>",
+                ["relativeMaturity"] = new Dictionary<string, object>()
                 {
-                    unit = "<unit>",
-                    value = 123.45d,
+                    ["unit"] = "<unit>",
+                    ["value"] = 123.45,
                 },
-                treatments = new[] {
-        "<String>"
-    },
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["treatments"] = new List<object>()
+{
+"<treatments>"
+},
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<cropProductId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<cropProductId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("cropIds")[0].ToString());
@@ -173,19 +173,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<cropProductId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<cropProductId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -195,36 +194,37 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                cropIds = new[] {
-        "<String>"
-    },
-                brand = "<brand>",
-                product = "<product>",
-                trait = "<trait>",
-                relativeMaturity = new
+                ["cropIds"] = new List<object>()
+{
+"<cropIds>"
+},
+                ["brand"] = "<brand>",
+                ["product"] = "<product>",
+                ["trait"] = "<trait>",
+                ["relativeMaturity"] = new Dictionary<string, object>()
                 {
-                    unit = "<unit>",
-                    value = 123.45d,
+                    ["unit"] = "<unit>",
+                    ["value"] = 123.45,
                 },
-                treatments = new[] {
-        "<String>"
-    },
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["treatments"] = new List<object>()
+{
+"<treatments>"
+},
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<cropProductId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<cropProductId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("cropIds")[0].ToString());
@@ -244,15 +244,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<cropProductId>");
             Console.WriteLine(response.Status);
@@ -262,8 +262,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<cropProductId>");
             Console.WriteLine(response.Status);
@@ -273,8 +273,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<cropProductId>");
             Console.WriteLine(response.Status);
@@ -284,8 +284,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<cropProductId>");
             Console.WriteLine(response.Status);
@@ -295,13 +295,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCropProducts()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetCropProducts(new string[] { "<cropIds>" }, new string[] { "<brands>" }, new string[] { "<products>" }, new string[] { "<traits>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetCropProducts(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -309,30 +309,54 @@ public void Example_GetCropProducts()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCropProducts_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetCropProducts(new string[] { "<cropIds>" }, new string[] { "<brands>" }, new string[] { "<products>" }, new string[] { "<traits>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetCropProducts(new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<brands>"
+}, new List<string>()
+{
+"<products>"
+}, new List<string>()
+{
+"<traits>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("cropIds")[0].ToString());
-                Console.WriteLine(result.GetProperty("brand").ToString());
-                Console.WriteLine(result.GetProperty("product").ToString());
-                Console.WriteLine(result.GetProperty("trait").ToString());
-                Console.WriteLine(result.GetProperty("relativeMaturity").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("relativeMaturity").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("treatments")[0].ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("cropIds")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("brand").ToString());
+                Console.WriteLine(result[0].GetProperty("product").ToString());
+                Console.WriteLine(result[0].GetProperty("trait").ToString());
+                Console.WriteLine(result[0].GetProperty("relativeMaturity").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("relativeMaturity").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("treatments")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -340,13 +364,13 @@ public void Example_GetCropProducts_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCropProducts_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetCropProductsAsync(new string[] { "<cropIds>" }, new string[] { "<brands>" }, new string[] { "<products>" }, new string[] { "<traits>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetCropProductsAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -354,30 +378,54 @@ public async Task Example_GetCropProducts_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCropProducts_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropProductsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            CropProducts client = new FarmBeatsClient(credential).GetCropProductsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetCropProductsAsync(new string[] { "<cropIds>" }, new string[] { "<brands>" }, new string[] { "<products>" }, new string[] { "<traits>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetCropProductsAsync(new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<brands>"
+}, new List<string>()
+{
+"<products>"
+}, new List<string>()
+{
+"<traits>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("cropIds")[0].ToString());
-                Console.WriteLine(result.GetProperty("brand").ToString());
-                Console.WriteLine(result.GetProperty("product").ToString());
-                Console.WriteLine(result.GetProperty("trait").ToString());
-                Console.WriteLine(result.GetProperty("relativeMaturity").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("relativeMaturity").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("treatments")[0].ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("cropIds")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("brand").ToString());
+                Console.WriteLine(result[0].GetProperty("product").ToString());
+                Console.WriteLine(result[0].GetProperty("trait").ToString());
+                Console.WriteLine(result[0].GetProperty("relativeMaturity").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("relativeMaturity").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("treatments")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
     }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Crops.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Crops.cs
index bb3ecd379b4c..102316d44742 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Crops.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Crops.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_Crops
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCrop()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCrop("<cropId>", new RequestContext());
+            Response response = client.GetCrop("<cropId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,16 +36,16 @@ public void Example_GetCrop()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCrop_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCrop("<cropId>", new RequestContext());
+            Response response = client.GetCrop("<cropId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("phenotype").ToString());
             Console.WriteLine(result.GetProperty("breedingMethod").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("eTag").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -56,17 +56,17 @@ public void Example_GetCrop_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCrop_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCropAsync("<cropId>", new RequestContext());
+            Response response = await client.GetCropAsync("<cropId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -76,16 +76,16 @@ public async Task Example_GetCrop_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCrop_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCropAsync("<cropId>", new RequestContext());
+            Response response = await client.GetCropAsync("<cropId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("phenotype").ToString());
             Console.WriteLine(result.GetProperty("breedingMethod").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("eTag").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -96,19 +96,18 @@ public async Task Example_GetCrop_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<cropId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<cropId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -118,38 +117,37 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                phenotype = "<phenotype>",
-                breedingMethod = "VARIETY",
-                measurements = new
+                ["phenotype"] = "<phenotype>",
+                ["breedingMethod"] = "VARIETY",
+                ["measurements"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        unit = "<unit>",
-                        value = 123.45d,
+                        ["unit"] = "<unit>",
+                        ["value"] = 123.45,
                     },
                 },
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<cropId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<cropId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("phenotype").ToString());
             Console.WriteLine(result.GetProperty("breedingMethod").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("eTag").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -160,19 +158,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateAsync("<cropId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<cropId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -182,38 +179,37 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                phenotype = "<phenotype>",
-                breedingMethod = "VARIETY",
-                measurements = new
+                ["phenotype"] = "<phenotype>",
+                ["breedingMethod"] = "VARIETY",
+                ["measurements"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        unit = "<unit>",
-                        value = 123.45d,
+                        ["unit"] = "<unit>",
+                        ["value"] = 123.45,
                     },
                 },
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<cropId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<cropId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("phenotype").ToString());
             Console.WriteLine(result.GetProperty("breedingMethod").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("eTag").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -224,15 +220,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<cropId>");
             Console.WriteLine(response.Status);
@@ -242,8 +238,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<cropId>");
             Console.WriteLine(response.Status);
@@ -253,8 +249,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<cropId>");
             Console.WriteLine(response.Status);
@@ -264,8 +260,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<cropId>");
             Console.WriteLine(response.Status);
@@ -275,13 +271,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCrops()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetCrops(new string[] { "<phenotypes>" }, new string[] { "<breedingMethods>" }, new string[] { "<cropIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetCrops(null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -289,27 +285,45 @@ public void Example_GetCrops()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCrops_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetCrops(new string[] { "<phenotypes>" }, new string[] { "<breedingMethods>" }, new string[] { "<cropIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetCrops(new List<string>()
+{
+"<phenotypes>"
+}, new List<string>()
+{
+"<breedingMethods>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("phenotype").ToString());
-                Console.WriteLine(result.GetProperty("breedingMethod").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("phenotype").ToString());
+                Console.WriteLine(result[0].GetProperty("breedingMethod").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -317,13 +331,13 @@ public void Example_GetCrops_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCrops_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetCropsAsync(new string[] { "<phenotypes>" }, new string[] { "<breedingMethods>" }, new string[] { "<cropIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetCropsAsync(null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -331,27 +345,45 @@ public async Task Example_GetCrops_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCrops_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetCropsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Crops client = new FarmBeatsClient(credential).GetCropsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetCropsAsync(new string[] { "<phenotypes>" }, new string[] { "<breedingMethods>" }, new string[] { "<cropIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetCropsAsync(new List<string>()
+{
+"<phenotypes>"
+}, new List<string>()
+{
+"<breedingMethods>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("phenotype").ToString());
-                Console.WriteLine(result.GetProperty("breedingMethod").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("phenotype").ToString());
+                Console.WriteLine(result[0].GetProperty("breedingMethod").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
     }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_DeviceDataModels.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_DeviceDataModels.cs
index 8722cbf412fc..81b2927f32e6 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_DeviceDataModels.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_DeviceDataModels.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,12 +23,11 @@ internal class Samples_DeviceDataModels
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceDataModelId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceDataModelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -38,30 +37,31 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                type = "<type>",
-                manufacturer = "<manufacturer>",
-                productCode = "<productCode>",
-                ports = new[] {
-        new {
-            name = "<name>",
-            type = "<type>",
-        }
-    },
-                status = "<status>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["type"] = "<type>",
+                ["manufacturer"] = "<manufacturer>",
+                ["productCode"] = "<productCode>",
+                ["ports"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["type"] = "<type>",
+}
+},
+                ["status"] = "<status>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceDataModelId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceDataModelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("type").ToString());
@@ -79,19 +79,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceDataModelId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceDataModelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -101,30 +100,31 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                type = "<type>",
-                manufacturer = "<manufacturer>",
-                productCode = "<productCode>",
-                ports = new[] {
-        new {
-            name = "<name>",
-            type = "<type>",
-        }
-    },
-                status = "<status>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["type"] = "<type>",
+                ["manufacturer"] = "<manufacturer>",
+                ["productCode"] = "<productCode>",
+                ["ports"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["type"] = "<type>",
+}
+},
+                ["status"] = "<status>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceDataModelId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceDataModelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("type").ToString());
@@ -142,17 +142,17 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceDataModel()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetDeviceDataModel("<sensorPartnerId>", "<deviceDataModelId>", new RequestContext());
+            Response response = client.GetDeviceDataModel("<sensorPartnerId>", "<deviceDataModelId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -162,10 +162,10 @@ public void Example_GetDeviceDataModel()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceDataModel_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetDeviceDataModel("<sensorPartnerId>", "<deviceDataModelId>", new RequestContext());
+            Response response = client.GetDeviceDataModel("<sensorPartnerId>", "<deviceDataModelId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("type").ToString());
@@ -183,17 +183,17 @@ public void Example_GetDeviceDataModel_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceDataModel_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetDeviceDataModelAsync("<sensorPartnerId>", "<deviceDataModelId>", new RequestContext());
+            Response response = await client.GetDeviceDataModelAsync("<sensorPartnerId>", "<deviceDataModelId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -203,10 +203,10 @@ public async Task Example_GetDeviceDataModel_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceDataModel_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetDeviceDataModelAsync("<sensorPartnerId>", "<deviceDataModelId>", new RequestContext());
+            Response response = await client.GetDeviceDataModelAsync("<sensorPartnerId>", "<deviceDataModelId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("type").ToString());
@@ -224,15 +224,15 @@ public async Task Example_GetDeviceDataModel_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<sensorPartnerId>", "<deviceDataModelId>");
             Console.WriteLine(response.Status);
@@ -242,8 +242,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<sensorPartnerId>", "<deviceDataModelId>");
             Console.WriteLine(response.Status);
@@ -253,8 +253,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<sensorPartnerId>", "<deviceDataModelId>");
             Console.WriteLine(response.Status);
@@ -264,8 +264,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<sensorPartnerId>", "<deviceDataModelId>");
             Console.WriteLine(response.Status);
@@ -275,13 +275,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceDataModels()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetDeviceDataModels("<sensorPartnerId>", new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetDeviceDataModels("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -289,28 +289,40 @@ public void Example_GetDeviceDataModels()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceDataModels_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetDeviceDataModels("<sensorPartnerId>", new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetDeviceDataModels("<sensorPartnerId>", new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("manufacturer").ToString());
-                Console.WriteLine(result.GetProperty("productCode").ToString());
-                Console.WriteLine(result.GetProperty("ports")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("ports")[0].GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("manufacturer").ToString());
+                Console.WriteLine(result[0].GetProperty("productCode").ToString());
+                Console.WriteLine(result[0].GetProperty("ports")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("ports")[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -318,13 +330,13 @@ public void Example_GetDeviceDataModels_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceDataModels_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetDeviceDataModelsAsync("<sensorPartnerId>", new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetDeviceDataModelsAsync("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -332,28 +344,40 @@ public async Task Example_GetDeviceDataModels_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceDataModels_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDeviceDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceDataModels client = new FarmBeatsClient(credential).GetDeviceDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetDeviceDataModelsAsync("<sensorPartnerId>", new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetDeviceDataModelsAsync("<sensorPartnerId>", new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("manufacturer").ToString());
-                Console.WriteLine(result.GetProperty("productCode").ToString());
-                Console.WriteLine(result.GetProperty("ports")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("ports")[0].GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("manufacturer").ToString());
+                Console.WriteLine(result[0].GetProperty("productCode").ToString());
+                Console.WriteLine(result[0].GetProperty("ports")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("ports")[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
     }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Devices.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Devices.cs
index c9724b983aeb..c32e5fc30b5d 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Devices.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Devices.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,12 +23,11 @@ internal class Samples_Devices
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -38,32 +37,31 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                deviceDataModelId = "<deviceDataModelId>",
-                integrationId = "<integrationId>",
-                type = "<type>",
-                hardwareId = "<hardwareId>",
-                reportingIntervalInSeconds = 1234,
-                parentDeviceId = "<parentDeviceId>",
-                location = new
+                ["deviceDataModelId"] = "<deviceDataModelId>",
+                ["integrationId"] = "<integrationId>",
+                ["type"] = "<type>",
+                ["hardwareId"] = "<hardwareId>",
+                ["reportingIntervalInSeconds"] = 1234,
+                ["parentDeviceId"] = "<parentDeviceId>",
+                ["location"] = new Dictionary<string, object>()
                 {
-                    latitude = 123.45d,
-                    longitude = 123.45d,
+                    ["latitude"] = 123.45,
+                    ["longitude"] = 123.45,
                 },
-                status = "<status>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<deviceId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deviceDataModelId").ToString());
@@ -84,19 +82,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -106,32 +103,31 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                deviceDataModelId = "<deviceDataModelId>",
-                integrationId = "<integrationId>",
-                type = "<type>",
-                hardwareId = "<hardwareId>",
-                reportingIntervalInSeconds = 1234,
-                parentDeviceId = "<parentDeviceId>",
-                location = new
+                ["deviceDataModelId"] = "<deviceDataModelId>",
+                ["integrationId"] = "<integrationId>",
+                ["type"] = "<type>",
+                ["hardwareId"] = "<hardwareId>",
+                ["reportingIntervalInSeconds"] = 1234,
+                ["parentDeviceId"] = "<parentDeviceId>",
+                ["location"] = new Dictionary<string, object>()
                 {
-                    latitude = 123.45d,
-                    longitude = 123.45d,
+                    ["latitude"] = 123.45,
+                    ["longitude"] = 123.45,
                 },
-                status = "<status>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<deviceId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deviceDataModelId").ToString());
@@ -152,17 +148,17 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDevice()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetDevice("<sensorPartnerId>", "<deviceId>", new RequestContext());
+            Response response = client.GetDevice("<sensorPartnerId>", "<deviceId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -172,10 +168,10 @@ public void Example_GetDevice()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDevice_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetDevice("<sensorPartnerId>", "<deviceId>", new RequestContext());
+            Response response = client.GetDevice("<sensorPartnerId>", "<deviceId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deviceDataModelId").ToString());
@@ -196,17 +192,17 @@ public void Example_GetDevice_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDevice_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetDeviceAsync("<sensorPartnerId>", "<deviceId>", new RequestContext());
+            Response response = await client.GetDeviceAsync("<sensorPartnerId>", "<deviceId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -216,10 +212,10 @@ public async Task Example_GetDevice_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDevice_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetDeviceAsync("<sensorPartnerId>", "<deviceId>", new RequestContext());
+            Response response = await client.GetDeviceAsync("<sensorPartnerId>", "<deviceId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deviceDataModelId").ToString());
@@ -240,15 +236,15 @@ public async Task Example_GetDevice_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<sensorPartnerId>", "<deviceId>");
             Console.WriteLine(response.Status);
@@ -258,8 +254,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<sensorPartnerId>", "<deviceId>");
             Console.WriteLine(response.Status);
@@ -269,8 +265,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<sensorPartnerId>", "<deviceId>");
             Console.WriteLine(response.Status);
@@ -280,8 +276,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<sensorPartnerId>", "<deviceId>");
             Console.WriteLine(response.Status);
@@ -291,13 +287,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDevices()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetDevices("<sensorPartnerId>", new string[] { "<parentDeviceIds>" }, new string[] { "<deviceDataModelIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetDevices("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -305,31 +301,49 @@ public void Example_GetDevices()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDevices_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetDevices("<sensorPartnerId>", new string[] { "<parentDeviceIds>" }, new string[] { "<deviceDataModelIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetDevices("<sensorPartnerId>", new List<string>()
+{
+"<parentDeviceIds>"
+}, new List<string>()
+{
+"<deviceDataModelIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceDataModelId").ToString());
-                Console.WriteLine(result.GetProperty("integrationId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("hardwareId").ToString());
-                Console.WriteLine(result.GetProperty("reportingIntervalInSeconds").ToString());
-                Console.WriteLine(result.GetProperty("parentDeviceId").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("latitude").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("longitude").ToString());
-                Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceDataModelId").ToString());
+                Console.WriteLine(result[0].GetProperty("integrationId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareId").ToString());
+                Console.WriteLine(result[0].GetProperty("reportingIntervalInSeconds").ToString());
+                Console.WriteLine(result[0].GetProperty("parentDeviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+                Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -337,13 +351,13 @@ public void Example_GetDevices_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDevices_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetDevicesAsync("<sensorPartnerId>", new string[] { "<parentDeviceIds>" }, new string[] { "<deviceDataModelIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetDevicesAsync("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -351,31 +365,49 @@ public async Task Example_GetDevices_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDevices_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetDevicesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Devices client = new FarmBeatsClient(credential).GetDevicesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetDevicesAsync("<sensorPartnerId>", new string[] { "<parentDeviceIds>" }, new string[] { "<deviceDataModelIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetDevicesAsync("<sensorPartnerId>", new List<string>()
+{
+"<parentDeviceIds>"
+}, new List<string>()
+{
+"<deviceDataModelIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceDataModelId").ToString());
-                Console.WriteLine(result.GetProperty("integrationId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("hardwareId").ToString());
-                Console.WriteLine(result.GetProperty("reportingIntervalInSeconds").ToString());
-                Console.WriteLine(result.GetProperty("parentDeviceId").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("latitude").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("longitude").ToString());
-                Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceDataModelId").ToString());
+                Console.WriteLine(result[0].GetProperty("integrationId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareId").ToString());
+                Console.WriteLine(result[0].GetProperty("reportingIntervalInSeconds").ToString());
+                Console.WriteLine(result[0].GetProperty("parentDeviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+                Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
     }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_FarmBeatsClient.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_FarmBeatsClient.cs
index 1ea53d911556..b13b5a40b2ff 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_FarmBeatsClient.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_FarmBeatsClient.cs
@@ -5,12 +5,6 @@
 
 #nullable disable
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
-using Azure;
-using Azure.Core;
 using Azure.Identity;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_FarmOperationsDataIngestion.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_FarmOperationsDataIngestion.cs
index aaee80cf8bc2..a12d0b75fc2f 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_FarmOperationsDataIngestion.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_FarmOperationsDataIngestion.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_FarmOperationsDataIngestion
         [Ignore("Only validating compilation of examples")]
         public void Example_GetJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -38,10 +38,10 @@ public void Example_GetJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -62,17 +62,17 @@ public void Example_GetJobDetails_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -84,10 +84,10 @@ public async Task Example_GetJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -108,26 +108,25 @@ public async Task Example_GetJobDetails_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                authProviderId = "<authProviderId>",
-                startYear = 1234,
-            };
-
-            var operation = client.CreateJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+                ["partyId"] = "<partyId>",
+                ["authProviderId"] = "<authProviderId>",
+                ["startYear"] = 1234,
+            });
+            Operation<BinaryData> operation = client.CreateJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("authProviderId").ToString());
@@ -138,29 +137,29 @@ public void Example_CreateJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                authProviderId = "<authProviderId>",
-                operations = new[] {
-        "<String>"
-    },
-                startYear = 1234,
-                isIncremental = true,
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["partyId"] = "<partyId>",
+                ["authProviderId"] = "<authProviderId>",
+                ["operations"] = new List<object>()
+{
+"<operations>"
+},
+                ["startYear"] = 1234,
+                ["isIncremental"] = true,
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = client.CreateJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.CreateJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("authProviderId").ToString());
@@ -180,26 +179,25 @@ public void Example_CreateJob_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                authProviderId = "<authProviderId>",
-                startYear = 1234,
-            };
-
-            var operation = await client.CreateJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+                ["partyId"] = "<partyId>",
+                ["authProviderId"] = "<authProviderId>",
+                ["startYear"] = 1234,
+            });
+            Operation<BinaryData> operation = await client.CreateJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("authProviderId").ToString());
@@ -210,29 +208,29 @@ public async Task Example_CreateJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmOperationsDataIngestion client = new FarmBeatsClient(credential).GetFarmOperationsDataIngestionClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                authProviderId = "<authProviderId>",
-                operations = new[] {
-        "<String>"
-    },
-                startYear = 1234,
-                isIncremental = true,
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["partyId"] = "<partyId>",
+                ["authProviderId"] = "<authProviderId>",
+                ["operations"] = new List<object>()
+{
+"<operations>"
+},
+                ["startYear"] = 1234,
+                ["isIncremental"] = true,
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = await client.CreateJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.CreateJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("authProviderId").ToString());
@@ -252,7 +250,7 @@ public async Task Example_CreateJob_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
     }
 }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_FarmerOAuthTokens.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_FarmerOAuthTokens.cs
index 72169e7aed75..891803b76d2a 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_FarmerOAuthTokens.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_FarmerOAuthTokens.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,17 +23,16 @@ internal class Samples_FarmerOAuthTokens
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOAuthConnectionLink()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                oAuthProviderId = "<oAuthProviderId>",
-                userRedirectLink = "<userRedirectLink>",
-            };
-
-            Response response = client.GetOAuthConnectionLink(RequestContent.Create(data));
+                ["partyId"] = "<partyId>",
+                ["oAuthProviderId"] = "<oAuthProviderId>",
+                ["userRedirectLink"] = "<userRedirectLink>",
+            });
+            Response response = client.GetOAuthConnectionLink(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -43,18 +42,17 @@ public void Example_GetOAuthConnectionLink()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOAuthConnectionLink_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                oAuthProviderId = "<oAuthProviderId>",
-                userRedirectLink = "<userRedirectLink>",
-                userRedirectState = "<userRedirectState>",
-            };
-
-            Response response = client.GetOAuthConnectionLink(RequestContent.Create(data));
+                ["partyId"] = "<partyId>",
+                ["oAuthProviderId"] = "<oAuthProviderId>",
+                ["userRedirectLink"] = "<userRedirectLink>",
+                ["userRedirectState"] = "<userRedirectState>",
+            });
+            Response response = client.GetOAuthConnectionLink(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -64,17 +62,16 @@ public void Example_GetOAuthConnectionLink_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOAuthConnectionLink_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                oAuthProviderId = "<oAuthProviderId>",
-                userRedirectLink = "<userRedirectLink>",
-            };
-
-            Response response = await client.GetOAuthConnectionLinkAsync(RequestContent.Create(data));
+                ["partyId"] = "<partyId>",
+                ["oAuthProviderId"] = "<oAuthProviderId>",
+                ["userRedirectLink"] = "<userRedirectLink>",
+            });
+            Response response = await client.GetOAuthConnectionLinkAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -84,18 +81,17 @@ public async Task Example_GetOAuthConnectionLink_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOAuthConnectionLink_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                oAuthProviderId = "<oAuthProviderId>",
-                userRedirectLink = "<userRedirectLink>",
-                userRedirectState = "<userRedirectState>",
-            };
-
-            Response response = await client.GetOAuthConnectionLinkAsync(RequestContent.Create(data));
+                ["partyId"] = "<partyId>",
+                ["oAuthProviderId"] = "<oAuthProviderId>",
+                ["userRedirectLink"] = "<userRedirectLink>",
+                ["userRedirectState"] = "<userRedirectState>",
+            });
+            Response response = await client.GetOAuthConnectionLinkAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -105,10 +101,10 @@ public async Task Example_GetOAuthConnectionLink_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -120,10 +116,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -144,10 +140,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -159,10 +155,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -183,14 +179,14 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAuthenticatedFarmersDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAuthenticatedFarmersDetails(new string[] { "<authProviderIds>" }, new string[] { "<partyIds>" }, true, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAuthenticatedFarmersDetails(null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("authProviderId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("authProviderId").ToString());
             }
         }
 
@@ -198,18 +194,24 @@ public void Example_GetAuthenticatedFarmersDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAuthenticatedFarmersDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAuthenticatedFarmersDetails(new string[] { "<authProviderIds>" }, new string[] { "<partyIds>" }, true, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAuthenticatedFarmersDetails(new List<string>()
+{
+"<authProviderIds>"
+}, new List<string>()
+{
+"<partyIds>"
+}, true, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("authProviderId").ToString());
-                Console.WriteLine(result.GetProperty("isValid").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("authProviderId").ToString());
+                Console.WriteLine(result[0].GetProperty("isValid").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
             }
         }
 
@@ -217,14 +219,14 @@ public void Example_GetAuthenticatedFarmersDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAuthenticatedFarmersDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAuthenticatedFarmersDetailsAsync(new string[] { "<authProviderIds>" }, new string[] { "<partyIds>" }, true, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAuthenticatedFarmersDetailsAsync(null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("authProviderId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("authProviderId").ToString());
             }
         }
 
@@ -232,18 +234,24 @@ public async Task Example_GetAuthenticatedFarmersDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAuthenticatedFarmersDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAuthenticatedFarmersDetailsAsync(new string[] { "<authProviderIds>" }, new string[] { "<partyIds>" }, true, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAuthenticatedFarmersDetailsAsync(new List<string>()
+{
+"<authProviderIds>"
+}, new List<string>()
+{
+"<partyIds>"
+}, true, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("authProviderId").ToString());
-                Console.WriteLine(result.GetProperty("isValid").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("authProviderId").ToString());
+                Console.WriteLine(result[0].GetProperty("isValid").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
             }
         }
 
@@ -251,12 +259,12 @@ public async Task Example_GetAuthenticatedFarmersDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<oauthProviderId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<oauthProviderId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -267,12 +275,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<oauthProviderId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<oauthProviderId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -292,12 +300,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<oauthProviderId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<oauthProviderId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -308,12 +316,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<oauthProviderId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            FarmerOAuthTokens client = new FarmBeatsClient(credential).GetFarmerOAuthTokensClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<oauthProviderId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Farms.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Farms.cs
index 8635de79fda2..0595a3b45620 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Farms.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Farms.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_Farms
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -38,10 +38,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -62,10 +62,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -77,10 +77,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -101,10 +101,10 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFarm()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetFarm("<partyId>", "<farmId>", new RequestContext());
+            Response response = client.GetFarm("<partyId>", "<farmId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -114,10 +114,10 @@ public void Example_GetFarm()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFarm_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetFarm("<partyId>", "<farmId>", new RequestContext());
+            Response response = client.GetFarm("<partyId>", "<farmId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -131,17 +131,17 @@ public void Example_GetFarm_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFarm_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetFarmAsync("<partyId>", "<farmId>", new RequestContext());
+            Response response = await client.GetFarmAsync("<partyId>", "<farmId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -151,10 +151,10 @@ public async Task Example_GetFarm_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFarm_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetFarmAsync("<partyId>", "<farmId>", new RequestContext());
+            Response response = await client.GetFarmAsync("<partyId>", "<farmId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -168,19 +168,18 @@ public async Task Example_GetFarm_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<farmId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<farmId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -190,22 +189,21 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<farmId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<farmId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -219,19 +217,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<farmId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<farmId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -241,22 +238,21 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<farmId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<farmId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -270,15 +266,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<farmId>");
             Console.WriteLine(response.Status);
@@ -288,8 +284,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<farmId>");
             Console.WriteLine(response.Status);
@@ -299,8 +295,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<farmId>");
             Console.WriteLine(response.Status);
@@ -310,8 +306,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<farmId>");
             Console.WriteLine(response.Status);
@@ -321,13 +317,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFarms()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetFarms(new string[] { "<farmIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetFarms(null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -335,24 +331,36 @@ public void Example_GetFarms()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFarms_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetFarms(new string[] { "<farmIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetFarms(new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -360,13 +368,13 @@ public void Example_GetFarms_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFarms_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetFarmsAsync(new string[] { "<farmIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetFarmsAsync(null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -374,24 +382,36 @@ public async Task Example_GetFarms_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFarms_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetFarmsAsync(new string[] { "<farmIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetFarmsAsync(new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -399,13 +419,13 @@ public async Task Example_GetFarms_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFarmsByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetFarmsByPartyId("<partyId>", new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetFarmsByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -413,24 +433,36 @@ public void Example_GetFarmsByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFarmsByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetFarmsByPartyId("<partyId>", new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetFarmsByPartyId("<partyId>", new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -438,13 +470,13 @@ public void Example_GetFarmsByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFarmsByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetFarmsByPartyIdAsync("<partyId>", new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetFarmsByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -452,24 +484,36 @@ public async Task Example_GetFarmsByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFarmsByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetFarmsByPartyIdAsync("<partyId>", new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetFarmsByPartyIdAsync("<partyId>", new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -477,12 +521,12 @@ public async Task Example_GetFarmsByPartyId_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<farmId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<farmId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -493,12 +537,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<farmId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<farmId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -518,12 +562,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<farmId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<farmId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -534,12 +578,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFarmsClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<farmId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Farms client = new FarmBeatsClient(credential).GetFarmsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<farmId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Fields.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Fields.cs
index 6e22fc44f38b..5f618e2f4a4a 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Fields.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Fields.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_Fields
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -38,10 +38,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -62,10 +62,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -77,10 +77,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -101,10 +101,10 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetField()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetField("<partyId>", "<fieldId>", new RequestContext());
+            Response response = client.GetField("<partyId>", "<fieldId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -114,10 +114,10 @@ public void Example_GetField()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetField_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetField("<partyId>", "<fieldId>", new RequestContext());
+            Response response = client.GetField("<partyId>", "<fieldId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("farmId").ToString());
@@ -132,17 +132,17 @@ public void Example_GetField_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetField_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetFieldAsync("<partyId>", "<fieldId>", new RequestContext());
+            Response response = await client.GetFieldAsync("<partyId>", "<fieldId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -152,10 +152,10 @@ public async Task Example_GetField_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetField_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetFieldAsync("<partyId>", "<fieldId>", new RequestContext());
+            Response response = await client.GetFieldAsync("<partyId>", "<fieldId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("farmId").ToString());
@@ -170,19 +170,18 @@ public async Task Example_GetField_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<fieldId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<fieldId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -192,23 +191,22 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                farmId = "<farmId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["farmId"] = "<farmId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<fieldId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<fieldId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("farmId").ToString());
@@ -223,19 +221,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<fieldId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<fieldId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -245,23 +242,22 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                farmId = "<farmId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["farmId"] = "<farmId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<fieldId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<fieldId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("farmId").ToString());
@@ -276,15 +272,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<fieldId>");
             Console.WriteLine(response.Status);
@@ -294,8 +290,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<fieldId>");
             Console.WriteLine(response.Status);
@@ -305,8 +301,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<fieldId>");
             Console.WriteLine(response.Status);
@@ -316,8 +312,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<fieldId>");
             Console.WriteLine(response.Status);
@@ -327,13 +323,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFields()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetFields(new string[] { "<farmIds>" }, new string[] { "<fieldIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetFields(null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -341,25 +337,40 @@ public void Example_GetFields()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFields_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetFields(new string[] { "<farmIds>" }, new string[] { "<fieldIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetFields(new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("farmId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("farmId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -367,13 +378,13 @@ public void Example_GetFields_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFields_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetFieldsAsync(new string[] { "<farmIds>" }, new string[] { "<fieldIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetFieldsAsync(null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -381,25 +392,40 @@ public async Task Example_GetFields_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFields_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetFieldsAsync(new string[] { "<farmIds>" }, new string[] { "<fieldIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetFieldsAsync(new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("farmId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("farmId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -407,13 +433,13 @@ public async Task Example_GetFields_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFieldsByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetFieldsByPartyId("<partyId>", new string[] { "<farmIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetFieldsByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -421,25 +447,40 @@ public void Example_GetFieldsByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFieldsByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetFieldsByPartyId("<partyId>", new string[] { "<farmIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetFieldsByPartyId("<partyId>", new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("farmId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("farmId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -447,13 +488,13 @@ public void Example_GetFieldsByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFieldsByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetFieldsByPartyIdAsync("<partyId>", new string[] { "<farmIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetFieldsByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -461,25 +502,40 @@ public async Task Example_GetFieldsByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFieldsByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetFieldsByPartyIdAsync("<partyId>", new string[] { "<farmIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetFieldsByPartyIdAsync("<partyId>", new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("farmId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("farmId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -487,12 +543,12 @@ public async Task Example_GetFieldsByPartyId_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<fieldId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<fieldId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -503,12 +559,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<fieldId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<fieldId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -528,12 +584,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<fieldId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<fieldId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -544,12 +600,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetFieldsClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<fieldId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Fields client = new FarmBeatsClient(credential).GetFieldsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<fieldId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_HarvestData.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_HarvestData.cs
index 998f00531567..8f1a4769f565 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_HarvestData.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_HarvestData.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_HarvestData
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -38,10 +38,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -62,10 +62,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -77,10 +77,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -101,10 +101,10 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetHarvestData()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetHarvestData("<partyId>", "<harvestDataId>", new RequestContext());
+            Response response = client.GetHarvestData("<partyId>", "<harvestDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -114,10 +114,10 @@ public void Example_GetHarvestData()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetHarvestData_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetHarvestData("<partyId>", "<harvestDataId>", new RequestContext());
+            Response response = client.GetHarvestData("<partyId>", "<harvestDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
@@ -163,17 +163,17 @@ public void Example_GetHarvestData_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetHarvestData_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetHarvestDataAsync("<partyId>", "<harvestDataId>", new RequestContext());
+            Response response = await client.GetHarvestDataAsync("<partyId>", "<harvestDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -183,10 +183,10 @@ public async Task Example_GetHarvestData_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetHarvestData_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetHarvestDataAsync("<partyId>", "<harvestDataId>", new RequestContext());
+            Response response = await client.GetHarvestDataAsync("<partyId>", "<harvestDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
@@ -232,19 +232,18 @@ public async Task Example_GetHarvestData_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<harvestDataId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<harvestDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -254,90 +253,61 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                totalYield = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                avgYield = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                totalWetMass = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                avgWetMass = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                avgMoisture = new
+                ["totalYield"] = new Dictionary<string, object>()
                 {
-                    unit = "<unit>",
-                    value = 123.45d,
+                    ["unit"] = "<unit>",
+                    ["value"] = 123.45,
                 },
-                avgSpeed = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                harvestProductDetails = new[] {
-        new {
-            productName = "<productName>",
-            area = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalYield = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgYield = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgMoisture = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalWetMass = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgWetMass = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-        }
-    },
-                area = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                associatedBoundaryId = "<associatedBoundaryId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["avgYield"] = null
+            ,
+                ["totalWetMass"] = null
+            ,
+                ["avgWetMass"] = null
+            ,
+                ["avgMoisture"] = null
+            ,
+                ["avgSpeed"] = null
+            ,
+                ["harvestProductDetails"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["productName"] = "<productName>",
+["area"] = null
+,
+["totalYield"] = null
+,
+["avgYield"] = null
+,
+["avgMoisture"] = null
+,
+["totalWetMass"] = null
+,
+["avgWetMass"] = null
+,
+}
+},
+                ["area"] = null
+            ,
+                ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["associatedBoundaryId"] = "<associatedBoundaryId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<harvestDataId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<harvestDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
@@ -383,19 +353,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<harvestDataId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<harvestDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -405,90 +374,61 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                totalYield = new
+                ["totalYield"] = new Dictionary<string, object>()
                 {
-                    unit = "<unit>",
-                    value = 123.45d,
+                    ["unit"] = "<unit>",
+                    ["value"] = 123.45,
                 },
-                avgYield = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                totalWetMass = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                avgWetMass = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                avgMoisture = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                avgSpeed = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                harvestProductDetails = new[] {
-        new {
-            productName = "<productName>",
-            area = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalYield = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgYield = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgMoisture = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalWetMass = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgWetMass = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-        }
-    },
-                area = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                associatedBoundaryId = "<associatedBoundaryId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["avgYield"] = null
+            ,
+                ["totalWetMass"] = null
+            ,
+                ["avgWetMass"] = null
+            ,
+                ["avgMoisture"] = null
+            ,
+                ["avgSpeed"] = null
+            ,
+                ["harvestProductDetails"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["productName"] = "<productName>",
+["area"] = null
+,
+["totalYield"] = null
+,
+["avgYield"] = null
+,
+["avgMoisture"] = null
+,
+["totalWetMass"] = null
+,
+["avgWetMass"] = null
+,
+}
+},
+                ["area"] = null
+            ,
+                ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["associatedBoundaryId"] = "<associatedBoundaryId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<harvestDataId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<harvestDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
@@ -534,15 +474,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<harvestDataId>");
             Console.WriteLine(response.Status);
@@ -552,8 +492,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<harvestDataId>");
             Console.WriteLine(response.Status);
@@ -563,8 +503,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<harvestDataId>");
             Console.WriteLine(response.Status);
@@ -574,8 +514,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<harvestDataId>");
             Console.WriteLine(response.Status);
@@ -585,13 +525,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllHarvestData()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllHarvestData(3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<harvestDataIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllHarvestData(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -599,56 +539,74 @@ public void Example_GetAllHarvestData()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllHarvestData_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllHarvestData(3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<harvestDataIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllHarvestData(123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<harvestDataIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -656,13 +614,13 @@ public void Example_GetAllHarvestData_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllHarvestData_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllHarvestDataAsync(3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<harvestDataIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllHarvestDataAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -670,56 +628,74 @@ public async Task Example_GetAllHarvestData_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllHarvestData_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllHarvestDataAsync(3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<harvestDataIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllHarvestDataAsync(123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<harvestDataIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -727,13 +703,13 @@ public async Task Example_GetAllHarvestData_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllHarvestDataByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllHarvestDataByPartyId("<partyId>", 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllHarvestDataByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -741,56 +717,74 @@ public void Example_GetAllHarvestDataByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllHarvestDataByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllHarvestDataByPartyId("<partyId>", 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllHarvestDataByPartyId("<partyId>", 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -798,13 +792,13 @@ public void Example_GetAllHarvestDataByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllHarvestDataByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllHarvestDataByPartyIdAsync("<partyId>", 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllHarvestDataByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -812,56 +806,74 @@ public async Task Example_GetAllHarvestDataByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllHarvestDataByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllHarvestDataByPartyIdAsync("<partyId>", 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllHarvestDataByPartyIdAsync("<partyId>", 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("totalYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgMoisture").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgSpeed").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgSpeed").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgYield").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgMoisture").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("totalWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("harvestProductDetails")[0].GetProperty("avgWetMass").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -869,12 +881,12 @@ public async Task Example_GetAllHarvestDataByPartyId_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<harvestDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<harvestDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -885,12 +897,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<harvestDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<harvestDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -910,12 +922,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<harvestDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<harvestDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -926,12 +938,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetHarvestDataClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<harvestDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            HarvestData client = new FarmBeatsClient(credential).GetHarvestDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<harvestDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ImageProcessing.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ImageProcessing.cs
index 55e37da6d64e..ef1d079caa16 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ImageProcessing.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ImageProcessing.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_ImageProcessing
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRasterizeJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetImageProcessingClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetRasterizeJob("<jobId>", new RequestContext());
+            Response response = client.GetRasterizeJob("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -38,10 +38,10 @@ public void Example_GetRasterizeJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRasterizeJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetImageProcessingClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetRasterizeJob("<jobId>", new RequestContext());
+            Response response = client.GetRasterizeJob("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -60,17 +60,17 @@ public void Example_GetRasterizeJob_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRasterizeJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetImageProcessingClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetRasterizeJobAsync("<jobId>", new RequestContext());
+            Response response = await client.GetRasterizeJobAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -82,10 +82,10 @@ public async Task Example_GetRasterizeJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRasterizeJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetImageProcessingClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetRasterizeJobAsync("<jobId>", new RequestContext());
+            Response response = await client.GetRasterizeJobAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -104,28 +104,28 @@ public async Task Example_GetRasterizeJob_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateRasterizeJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetImageProcessingClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                shapefileAttachmentId = "<shapefileAttachmentId>",
-                shapefileColumnNames = new[] {
-        "<String>"
-    },
-            };
-
-            var operation = client.CreateRasterizeJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+                ["partyId"] = "<partyId>",
+                ["shapefileAttachmentId"] = "<shapefileAttachmentId>",
+                ["shapefileColumnNames"] = new List<object>()
+{
+"<shapefileColumnNames>"
+},
+            });
+            Operation<BinaryData> operation = client.CreateRasterizeJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("shapefileAttachmentId").ToString());
@@ -136,27 +136,27 @@ public void Example_CreateRasterizeJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateRasterizeJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetImageProcessingClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                shapefileAttachmentId = "<shapefileAttachmentId>",
-                shapefileColumnNames = new[] {
-        "<String>"
-    },
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["partyId"] = "<partyId>",
+                ["shapefileAttachmentId"] = "<shapefileAttachmentId>",
+                ["shapefileColumnNames"] = new List<object>()
+{
+"<shapefileColumnNames>"
+},
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = client.CreateRasterizeJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.CreateRasterizeJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("shapefileAttachmentId").ToString());
@@ -174,28 +174,28 @@ public void Example_CreateRasterizeJob_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateRasterizeJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetImageProcessingClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                shapefileAttachmentId = "<shapefileAttachmentId>",
-                shapefileColumnNames = new[] {
-        "<String>"
-    },
-            };
-
-            var operation = await client.CreateRasterizeJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+                ["partyId"] = "<partyId>",
+                ["shapefileAttachmentId"] = "<shapefileAttachmentId>",
+                ["shapefileColumnNames"] = new List<object>()
+{
+"<shapefileColumnNames>"
+},
+            });
+            Operation<BinaryData> operation = await client.CreateRasterizeJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("shapefileAttachmentId").ToString());
@@ -206,27 +206,27 @@ public async Task Example_CreateRasterizeJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateRasterizeJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetImageProcessingClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ImageProcessing client = new FarmBeatsClient(credential).GetImageProcessingClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                shapefileAttachmentId = "<shapefileAttachmentId>",
-                shapefileColumnNames = new[] {
-        "<String>"
-    },
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["partyId"] = "<partyId>",
+                ["shapefileAttachmentId"] = "<shapefileAttachmentId>",
+                ["shapefileColumnNames"] = new List<object>()
+{
+"<shapefileColumnNames>"
+},
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = await client.CreateRasterizeJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.CreateRasterizeJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("shapefileAttachmentId").ToString());
@@ -244,7 +244,7 @@ public async Task Example_CreateRasterizeJob_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
     }
 }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_InsightAttachments.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_InsightAttachments.cs
index 78a84fa4485e..b2d0299098e7 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_InsightAttachments.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_InsightAttachments.cs
@@ -13,6 +13,7 @@
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,12 +24,11 @@ internal class Samples_InsightAttachments
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            var data = File.OpenRead("<filePath>");
-
-            Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create("<insightId>");
+            Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("insightId").ToString());
@@ -38,12 +38,11 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
-
-            var data = File.OpenRead("<filePath>");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("insightId").ToString());
@@ -68,12 +67,11 @@ public void Example_CreateOrUpdate_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            var data = File.OpenRead("<filePath>");
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create("<insightId>");
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("insightId").ToString());
@@ -83,12 +81,11 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
-
-            var data = File.OpenRead("<filePath>");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("insightId").ToString());
@@ -113,10 +110,10 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetInsightAttachment()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetInsightAttachment("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", new RequestContext());
+            Response response = client.GetInsightAttachment("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("insightId").ToString());
@@ -126,10 +123,10 @@ public void Example_GetInsightAttachment()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetInsightAttachment_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetInsightAttachment("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", new RequestContext());
+            Response response = client.GetInsightAttachment("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("insightId").ToString());
@@ -154,10 +151,10 @@ public void Example_GetInsightAttachment_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetInsightAttachment_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetInsightAttachmentAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", new RequestContext());
+            Response response = await client.GetInsightAttachmentAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("insightId").ToString());
@@ -167,10 +164,10 @@ public async Task Example_GetInsightAttachment_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetInsightAttachment_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetInsightAttachmentAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", new RequestContext());
+            Response response = await client.GetInsightAttachmentAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("insightId").ToString());
@@ -195,8 +192,8 @@ public async Task Example_GetInsightAttachment_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>");
             Console.WriteLine(response.Status);
@@ -206,8 +203,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>");
             Console.WriteLine(response.Status);
@@ -217,8 +214,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>");
             Console.WriteLine(response.Status);
@@ -228,8 +225,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>");
             Console.WriteLine(response.Status);
@@ -239,13 +236,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_Download()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.Download("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", new RequestContext());
+            Response response = client.Download("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -256,13 +253,13 @@ public void Example_Download()
         [Ignore("Only validating compilation of examples")]
         public void Example_Download_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.Download("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", new RequestContext());
+            Response response = client.Download("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -273,13 +270,13 @@ public void Example_Download_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Download_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.DownloadAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", new RequestContext());
+            Response response = await client.DownloadAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -290,13 +287,13 @@ public async Task Example_Download_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Download_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.DownloadAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", new RequestContext());
+            Response response = await client.DownloadAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightAttachmentId>", null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -307,13 +304,13 @@ public async Task Example_Download_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetInsightAttachmentsByPartyIdModelIdAndResource()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetInsightAttachmentsByPartyIdModelIdAndResource("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", new string[] { "<insightIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetInsightAttachmentsByPartyIdModelIdAndResource("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("insightId").ToString());
+                Console.WriteLine(result[0].GetProperty("insightId").ToString());
             }
         }
 
@@ -321,28 +318,43 @@ public void Example_GetInsightAttachmentsByPartyIdModelIdAndResource()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetInsightAttachmentsByPartyIdModelIdAndResource_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetInsightAttachmentsByPartyIdModelIdAndResource("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", new string[] { "<insightIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetInsightAttachmentsByPartyIdModelIdAndResource("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", new List<string>()
+{
+"<insightIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("insightId").ToString());
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("resourceType").ToString());
-                Console.WriteLine(result.GetProperty("resourceId").ToString());
-                Console.WriteLine(result.GetProperty("originalFileName").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("insightId").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceType").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+                Console.WriteLine(result[0].GetProperty("originalFileName").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
             }
         }
 
@@ -350,13 +362,13 @@ public void Example_GetInsightAttachmentsByPartyIdModelIdAndResource_AllParamete
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetInsightAttachmentsByPartyIdModelIdAndResource_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetInsightAttachmentsByPartyIdModelIdAndResourceAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", new string[] { "<insightIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetInsightAttachmentsByPartyIdModelIdAndResourceAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("insightId").ToString());
+                Console.WriteLine(result[0].GetProperty("insightId").ToString());
             }
         }
 
@@ -364,28 +376,43 @@ public async Task Example_GetInsightAttachmentsByPartyIdModelIdAndResource_Async
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetInsightAttachmentsByPartyIdModelIdAndResource_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightAttachmentsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            InsightAttachments client = new FarmBeatsClient(credential).GetInsightAttachmentsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetInsightAttachmentsByPartyIdModelIdAndResourceAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", new string[] { "<insightIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetInsightAttachmentsByPartyIdModelIdAndResourceAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", new List<string>()
+{
+"<insightIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("insightId").ToString());
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("resourceType").ToString());
-                Console.WriteLine(result.GetProperty("resourceId").ToString());
-                Console.WriteLine(result.GetProperty("originalFileName").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("insightId").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceType").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+                Console.WriteLine(result[0].GetProperty("originalFileName").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
             }
         }
     }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Insights.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Insights.cs
index e570e60be2b1..9bf31b01c7d9 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Insights.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Insights.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_Insights
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -38,10 +38,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -62,10 +62,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -77,10 +77,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -101,12 +101,11 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -116,32 +115,31 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                modelVersion = "<modelVersion>",
-                insightStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                insightEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                measurements = new
+                ["modelVersion"] = "<modelVersion>",
+                ["insightStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["insightEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["measurements"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        unit = "<unit>",
-                        value = 123.45d,
+                        ["unit"] = "<unit>",
+                        ["value"] = 123.45,
                     },
                 },
-                status = "<status>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -152,8 +150,8 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
             Console.WriteLine(result.GetProperty("insightStartDateTime").ToString());
             Console.WriteLine(result.GetProperty("insightEndDateTime").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -163,19 +161,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -185,32 +182,31 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                modelVersion = "<modelVersion>",
-                insightStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                insightEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                measurements = new
+                ["modelVersion"] = "<modelVersion>",
+                ["insightStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["insightEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["measurements"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        unit = "<unit>",
-                        value = 123.45d,
+                        ["unit"] = "<unit>",
+                        ["value"] = 123.45,
                     },
                 },
-                status = "<status>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -221,8 +217,8 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
             Console.WriteLine(result.GetProperty("insightStartDateTime").ToString());
             Console.WriteLine(result.GetProperty("insightEndDateTime").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -232,17 +228,17 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetInsight()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetInsight("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", new RequestContext());
+            Response response = client.GetInsight("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -252,10 +248,10 @@ public void Example_GetInsight()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetInsight_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetInsight("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", new RequestContext());
+            Response response = client.GetInsight("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -266,8 +262,8 @@ public void Example_GetInsight_AllParameters()
             Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
             Console.WriteLine(result.GetProperty("insightStartDateTime").ToString());
             Console.WriteLine(result.GetProperty("insightEndDateTime").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -277,17 +273,17 @@ public void Example_GetInsight_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetInsight_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetInsightAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", new RequestContext());
+            Response response = await client.GetInsightAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -297,10 +293,10 @@ public async Task Example_GetInsight_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetInsight_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetInsightAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", new RequestContext());
+            Response response = await client.GetInsightAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -311,8 +307,8 @@ public async Task Example_GetInsight_AllParameters_Async()
             Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
             Console.WriteLine(result.GetProperty("insightStartDateTime").ToString());
             Console.WriteLine(result.GetProperty("insightEndDateTime").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -322,15 +318,15 @@ public async Task Example_GetInsight_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>");
             Console.WriteLine(response.Status);
@@ -340,8 +336,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>");
             Console.WriteLine(response.Status);
@@ -351,8 +347,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>");
             Console.WriteLine(response.Status);
@@ -362,8 +358,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>");
             Console.WriteLine(response.Status);
@@ -373,13 +369,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetInsightsByPartyIdModelIdAndResource()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetInsightsByPartyIdModelIdAndResource("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, new string[] { "<measurementFilters>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetInsightsByPartyIdModelIdAndResource("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -387,32 +383,47 @@ public void Example_GetInsightsByPartyIdModelIdAndResource()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetInsightsByPartyIdModelIdAndResource_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetInsightsByPartyIdModelIdAndResource("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, new string[] { "<measurementFilters>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetInsightsByPartyIdModelIdAndResource("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), new List<string>()
+{
+"<measurementFilters>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("resourceType").ToString());
-                Console.WriteLine(result.GetProperty("resourceId").ToString());
-                Console.WriteLine(result.GetProperty("modelVersion").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("insightStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("insightEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceType").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+                Console.WriteLine(result[0].GetProperty("modelVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("insightStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("insightEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -420,13 +431,13 @@ public void Example_GetInsightsByPartyIdModelIdAndResource_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetInsightsByPartyIdModelIdAndResource_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetInsightsByPartyIdModelIdAndResourceAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, new string[] { "<measurementFilters>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetInsightsByPartyIdModelIdAndResourceAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -434,32 +445,47 @@ public async Task Example_GetInsightsByPartyIdModelIdAndResource_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetInsightsByPartyIdModelIdAndResource_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetInsightsByPartyIdModelIdAndResourceAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, new string[] { "<measurementFilters>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetInsightsByPartyIdModelIdAndResourceAsync("<partyId>", "<modelId>", "<resourceType>", "<resourceId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), new List<string>()
+{
+"<measurementFilters>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("resourceType").ToString());
-                Console.WriteLine(result.GetProperty("resourceId").ToString());
-                Console.WriteLine(result.GetProperty("modelVersion").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("insightStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("insightEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceType").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+                Console.WriteLine(result[0].GetProperty("modelVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("insightStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("insightEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -467,12 +493,12 @@ public async Task Example_GetInsightsByPartyIdModelIdAndResource_AllParameters_A
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -483,12 +509,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -508,12 +534,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -524,12 +550,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetInsightsClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Insights client = new FarmBeatsClient(credential).GetInsightsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<modelId>", "<resourceType>", "<resourceId>", "<insightId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ManagementZones.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ManagementZones.cs
index c4905b788298..9775e9c185b7 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ManagementZones.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ManagementZones.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_ManagementZones
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -38,10 +38,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -62,10 +62,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -77,10 +77,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -101,10 +101,10 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetManagementZone()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetManagementZone("<partyId>", "<managementZoneId>", new RequestContext());
+            Response response = client.GetManagementZone("<partyId>", "<managementZoneId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -114,10 +114,10 @@ public void Example_GetManagementZone()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetManagementZone_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetManagementZone("<partyId>", "<managementZoneId>", new RequestContext());
+            Response response = client.GetManagementZone("<partyId>", "<managementZoneId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -135,17 +135,17 @@ public void Example_GetManagementZone_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetManagementZone_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetManagementZoneAsync("<partyId>", "<managementZoneId>", new RequestContext());
+            Response response = await client.GetManagementZoneAsync("<partyId>", "<managementZoneId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -155,10 +155,10 @@ public async Task Example_GetManagementZone_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetManagementZone_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetManagementZoneAsync("<partyId>", "<managementZoneId>", new RequestContext());
+            Response response = await client.GetManagementZoneAsync("<partyId>", "<managementZoneId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -176,19 +176,18 @@ public async Task Example_GetManagementZone_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<managementZoneId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<managementZoneId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -198,26 +197,25 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                type = "<type>",
-                seasonId = "<seasonId>",
-                cropId = "<cropId>",
-                fieldId = "<fieldId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["type"] = "<type>",
+                ["seasonId"] = "<seasonId>",
+                ["cropId"] = "<cropId>",
+                ["fieldId"] = "<fieldId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<managementZoneId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<managementZoneId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -235,19 +233,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<managementZoneId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<managementZoneId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -257,26 +254,25 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                type = "<type>",
-                seasonId = "<seasonId>",
-                cropId = "<cropId>",
-                fieldId = "<fieldId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["type"] = "<type>",
+                ["seasonId"] = "<seasonId>",
+                ["cropId"] = "<cropId>",
+                ["fieldId"] = "<fieldId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<managementZoneId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<managementZoneId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -294,15 +290,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<managementZoneId>");
             Console.WriteLine(response.Status);
@@ -312,8 +308,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<managementZoneId>");
             Console.WriteLine(response.Status);
@@ -323,8 +319,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<managementZoneId>");
             Console.WriteLine(response.Status);
@@ -334,8 +330,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<managementZoneId>");
             Console.WriteLine(response.Status);
@@ -345,13 +341,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetManagementZones()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetManagementZones(new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetManagementZones(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -359,28 +355,55 @@ public void Example_GetManagementZones()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetManagementZones_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetManagementZones(new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetManagementZones(new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -388,13 +411,13 @@ public void Example_GetManagementZones_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetManagementZones_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetManagementZonesAsync(new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetManagementZonesAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -402,28 +425,55 @@ public async Task Example_GetManagementZones_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetManagementZones_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetManagementZonesAsync(new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetManagementZonesAsync(new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -431,13 +481,13 @@ public async Task Example_GetManagementZones_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetManagementZonesByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetManagementZonesByPartyId("<partyId>", new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetManagementZonesByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -445,28 +495,55 @@ public void Example_GetManagementZonesByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetManagementZonesByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetManagementZonesByPartyId("<partyId>", new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetManagementZonesByPartyId("<partyId>", new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -474,13 +551,13 @@ public void Example_GetManagementZonesByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetManagementZonesByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetManagementZonesByPartyIdAsync("<partyId>", new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetManagementZonesByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -488,28 +565,55 @@ public async Task Example_GetManagementZonesByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetManagementZonesByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetManagementZonesByPartyIdAsync("<partyId>", new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetManagementZonesByPartyIdAsync("<partyId>", new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -517,12 +621,12 @@ public async Task Example_GetManagementZonesByPartyId_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<managementZoneId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<managementZoneId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -533,12 +637,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<managementZoneId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<managementZoneId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -558,12 +662,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<managementZoneId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<managementZoneId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -574,12 +678,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetManagementZonesClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<managementZoneId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            ManagementZones client = new FarmBeatsClient(credential).GetManagementZonesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<managementZoneId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ModelInference.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ModelInference.cs
index 4500a4edb2b3..2e2b364ceb53 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ModelInference.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_ModelInference.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_ModelInference
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBiomassModelJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetBiomassModelJob("<jobId>", new RequestContext());
+            Response response = client.GetBiomassModelJob("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -46,10 +46,10 @@ public void Example_GetBiomassModelJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBiomassModelJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetBiomassModelJob("<jobId>", new RequestContext());
+            Response response = client.GetBiomassModelJob("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -76,17 +76,17 @@ public void Example_GetBiomassModelJob_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBiomassModelJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetBiomassModelJobAsync("<jobId>", new RequestContext());
+            Response response = await client.GetBiomassModelJobAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -106,10 +106,10 @@ public async Task Example_GetBiomassModelJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBiomassModelJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetBiomassModelJobAsync("<jobId>", new RequestContext());
+            Response response = await client.GetBiomassModelJobAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -136,17 +136,17 @@ public async Task Example_GetBiomassModelJob_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorPlacementModelJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSensorPlacementModelJob("<jobId>", new RequestContext());
+            Response response = client.GetSensorPlacementModelJob("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -164,10 +164,10 @@ public void Example_GetSensorPlacementModelJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorPlacementModelJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSensorPlacementModelJob("<jobId>", new RequestContext());
+            Response response = client.GetSensorPlacementModelJob("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -192,17 +192,17 @@ public void Example_GetSensorPlacementModelJob_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorPlacementModelJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSensorPlacementModelJobAsync("<jobId>", new RequestContext());
+            Response response = await client.GetSensorPlacementModelJobAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -220,10 +220,10 @@ public async Task Example_GetSensorPlacementModelJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorPlacementModelJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSensorPlacementModelJobAsync("<jobId>", new RequestContext());
+            Response response = await client.GetSensorPlacementModelJobAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -248,17 +248,17 @@ public async Task Example_GetSensorPlacementModelJob_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSoilMoistureModelJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSoilMoistureModelJob("<jobId>", new RequestContext());
+            Response response = client.GetSoilMoistureModelJob("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -281,10 +281,10 @@ public void Example_GetSoilMoistureModelJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSoilMoistureModelJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSoilMoistureModelJob("<jobId>", new RequestContext());
+            Response response = client.GetSoilMoistureModelJob("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -314,17 +314,17 @@ public void Example_GetSoilMoistureModelJob_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSoilMoistureModelJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSoilMoistureModelJobAsync("<jobId>", new RequestContext());
+            Response response = await client.GetSoilMoistureModelJobAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -347,10 +347,10 @@ public async Task Example_GetSoilMoistureModelJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSoilMoistureModelJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSoilMoistureModelJobAsync("<jobId>", new RequestContext());
+            Response response = await client.GetSoilMoistureModelJobAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -380,34 +380,33 @@ public async Task Example_GetSoilMoistureModelJob_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateBiomassModelJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                modelVersion = "<modelVersion>",
-                cropName = "Corn",
-                plantingStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                weatherExtensionId = "<weatherExtensionId>",
-                satelliteProvider = "Microsoft",
-                satelliteSource = "Sentinel_2_L2A",
-                imageResolution = 123.45d,
-                imageFormat = "TIF",
-            };
-
-            var operation = client.CreateBiomassModelJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["modelVersion"] = "<modelVersion>",
+                ["cropName"] = "Corn",
+                ["plantingStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["weatherExtensionId"] = "<weatherExtensionId>",
+                ["satelliteProvider"] = "Microsoft",
+                ["satelliteSource"] = "Sentinel_2_L2A",
+                ["imageResolution"] = 123.45,
+                ["imageFormat"] = "TIF",
+            });
+            Operation<BinaryData> operation = client.CreateBiomassModelJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -426,33 +425,32 @@ public void Example_CreateBiomassModelJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateBiomassModelJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                modelVersion = "<modelVersion>",
-                cropName = "Corn",
-                plantingStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                weatherExtensionId = "<weatherExtensionId>",
-                satelliteProvider = "Microsoft",
-                satelliteSource = "Sentinel_2_L2A",
-                imageResolution = 123.45d,
-                imageFormat = "TIF",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["modelVersion"] = "<modelVersion>",
+                ["cropName"] = "Corn",
+                ["plantingStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["weatherExtensionId"] = "<weatherExtensionId>",
+                ["satelliteProvider"] = "Microsoft",
+                ["satelliteSource"] = "Sentinel_2_L2A",
+                ["imageResolution"] = 123.45,
+                ["imageFormat"] = "TIF",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = client.CreateBiomassModelJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.CreateBiomassModelJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -478,34 +476,33 @@ public void Example_CreateBiomassModelJob_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateBiomassModelJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                modelVersion = "<modelVersion>",
-                cropName = "Corn",
-                plantingStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                weatherExtensionId = "<weatherExtensionId>",
-                satelliteProvider = "Microsoft",
-                satelliteSource = "Sentinel_2_L2A",
-                imageResolution = 123.45d,
-                imageFormat = "TIF",
-            };
-
-            var operation = await client.CreateBiomassModelJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["modelVersion"] = "<modelVersion>",
+                ["cropName"] = "Corn",
+                ["plantingStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["weatherExtensionId"] = "<weatherExtensionId>",
+                ["satelliteProvider"] = "Microsoft",
+                ["satelliteSource"] = "Sentinel_2_L2A",
+                ["imageResolution"] = 123.45,
+                ["imageFormat"] = "TIF",
+            });
+            Operation<BinaryData> operation = await client.CreateBiomassModelJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -524,33 +521,32 @@ public async Task Example_CreateBiomassModelJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateBiomassModelJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                modelVersion = "<modelVersion>",
-                cropName = "Corn",
-                plantingStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                weatherExtensionId = "<weatherExtensionId>",
-                satelliteProvider = "Microsoft",
-                satelliteSource = "Sentinel_2_L2A",
-                imageResolution = 123.45d,
-                imageFormat = "TIF",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["modelVersion"] = "<modelVersion>",
+                ["cropName"] = "Corn",
+                ["plantingStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["weatherExtensionId"] = "<weatherExtensionId>",
+                ["satelliteProvider"] = "Microsoft",
+                ["satelliteSource"] = "Sentinel_2_L2A",
+                ["imageResolution"] = 123.45,
+                ["imageFormat"] = "TIF",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = await client.CreateBiomassModelJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.CreateBiomassModelJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -576,32 +572,31 @@ public async Task Example_CreateBiomassModelJob_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateSensorPlacementModelJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                modelVersion = "<modelVersion>",
-                inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                satelliteProvider = "Microsoft",
-                satelliteSource = "Sentinel_2_L2A",
-                sensorType = "<sensorType>",
-                isRanked = true,
-            };
-
-            var operation = client.CreateSensorPlacementModelJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["modelVersion"] = "<modelVersion>",
+                ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["satelliteProvider"] = "Microsoft",
+                ["satelliteSource"] = "Sentinel_2_L2A",
+                ["sensorType"] = "<sensorType>",
+                ["isRanked"] = true,
+            });
+            Operation<BinaryData> operation = client.CreateSensorPlacementModelJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -618,31 +613,30 @@ public void Example_CreateSensorPlacementModelJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateSensorPlacementModelJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                modelVersion = "<modelVersion>",
-                inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                satelliteProvider = "Microsoft",
-                satelliteSource = "Sentinel_2_L2A",
-                sensorType = "<sensorType>",
-                isRanked = true,
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["modelVersion"] = "<modelVersion>",
+                ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["satelliteProvider"] = "Microsoft",
+                ["satelliteSource"] = "Sentinel_2_L2A",
+                ["sensorType"] = "<sensorType>",
+                ["isRanked"] = true,
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = client.CreateSensorPlacementModelJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.CreateSensorPlacementModelJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -666,32 +660,31 @@ public void Example_CreateSensorPlacementModelJob_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateSensorPlacementModelJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                modelVersion = "<modelVersion>",
-                inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                satelliteProvider = "Microsoft",
-                satelliteSource = "Sentinel_2_L2A",
-                sensorType = "<sensorType>",
-                isRanked = true,
-            };
-
-            var operation = await client.CreateSensorPlacementModelJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["modelVersion"] = "<modelVersion>",
+                ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["satelliteProvider"] = "Microsoft",
+                ["satelliteSource"] = "Sentinel_2_L2A",
+                ["sensorType"] = "<sensorType>",
+                ["isRanked"] = true,
+            });
+            Operation<BinaryData> operation = await client.CreateSensorPlacementModelJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -708,31 +701,30 @@ public async Task Example_CreateSensorPlacementModelJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateSensorPlacementModelJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                modelVersion = "<modelVersion>",
-                inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                satelliteProvider = "Microsoft",
-                satelliteSource = "Sentinel_2_L2A",
-                sensorType = "<sensorType>",
-                isRanked = true,
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["modelVersion"] = "<modelVersion>",
+                ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["satelliteProvider"] = "Microsoft",
+                ["satelliteSource"] = "Sentinel_2_L2A",
+                ["sensorType"] = "<sensorType>",
+                ["isRanked"] = true,
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = await client.CreateSensorPlacementModelJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.CreateSensorPlacementModelJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -756,40 +748,39 @@ public async Task Example_CreateSensorPlacementModelJob_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateSoilMoistureModelJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                sensorDataModelId = "<sensorDataModelId>",
-                sensorPartnerId = "<sensorPartnerId>",
-                inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                satelliteProvider = "Microsoft",
-                satelliteSource = "Sentinel_2_L2A",
-                imageResolution = 123.45d,
-                imageFormat = "TIF",
-                modelVersion = "<modelVersion>",
-                sensorDefinition = new
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["sensorDataModelId"] = "<sensorDataModelId>",
+                ["sensorPartnerId"] = "<sensorPartnerId>",
+                ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["satelliteProvider"] = "Microsoft",
+                ["satelliteSource"] = "Sentinel_2_L2A",
+                ["imageResolution"] = 123.45,
+                ["imageFormat"] = "TIF",
+                ["modelVersion"] = "<modelVersion>",
+                ["sensorDefinition"] = new Dictionary<string, object>()
                 {
-                    sensorMeasurement = "<sensorMeasurement>",
-                    minProperty = "<minProperty>",
-                    maxProperty = "<maxProperty>",
+                    ["sensorMeasurement"] = "<sensorMeasurement>",
+                    ["minProperty"] = "<minProperty>",
+                    ["maxProperty"] = "<maxProperty>",
                 },
-            };
-
-            var operation = client.CreateSoilMoistureModelJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.CreateSoilMoistureModelJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -811,39 +802,38 @@ public void Example_CreateSoilMoistureModelJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateSoilMoistureModelJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                sensorDataModelId = "<sensorDataModelId>",
-                sensorPartnerId = "<sensorPartnerId>",
-                inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                satelliteProvider = "Microsoft",
-                satelliteSource = "Sentinel_2_L2A",
-                imageResolution = 123.45d,
-                imageFormat = "TIF",
-                modelVersion = "<modelVersion>",
-                sensorDefinition = new
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["sensorDataModelId"] = "<sensorDataModelId>",
+                ["sensorPartnerId"] = "<sensorPartnerId>",
+                ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["satelliteProvider"] = "Microsoft",
+                ["satelliteSource"] = "Sentinel_2_L2A",
+                ["imageResolution"] = 123.45,
+                ["imageFormat"] = "TIF",
+                ["modelVersion"] = "<modelVersion>",
+                ["sensorDefinition"] = new Dictionary<string, object>()
                 {
-                    sensorMeasurement = "<sensorMeasurement>",
-                    minProperty = "<minProperty>",
-                    maxProperty = "<maxProperty>",
+                    ["sensorMeasurement"] = "<sensorMeasurement>",
+                    ["minProperty"] = "<minProperty>",
+                    ["maxProperty"] = "<maxProperty>",
                 },
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = client.CreateSoilMoistureModelJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.CreateSoilMoistureModelJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -872,40 +862,39 @@ public void Example_CreateSoilMoistureModelJob_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateSoilMoistureModelJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                sensorDataModelId = "<sensorDataModelId>",
-                sensorPartnerId = "<sensorPartnerId>",
-                inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                satelliteProvider = "Microsoft",
-                satelliteSource = "Sentinel_2_L2A",
-                imageResolution = 123.45d,
-                imageFormat = "TIF",
-                modelVersion = "<modelVersion>",
-                sensorDefinition = new
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["sensorDataModelId"] = "<sensorDataModelId>",
+                ["sensorPartnerId"] = "<sensorPartnerId>",
+                ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["satelliteProvider"] = "Microsoft",
+                ["satelliteSource"] = "Sentinel_2_L2A",
+                ["imageResolution"] = 123.45,
+                ["imageFormat"] = "TIF",
+                ["modelVersion"] = "<modelVersion>",
+                ["sensorDefinition"] = new Dictionary<string, object>()
                 {
-                    sensorMeasurement = "<sensorMeasurement>",
-                    minProperty = "<minProperty>",
-                    maxProperty = "<maxProperty>",
+                    ["sensorMeasurement"] = "<sensorMeasurement>",
+                    ["minProperty"] = "<minProperty>",
+                    ["maxProperty"] = "<maxProperty>",
                 },
-            };
-
-            var operation = await client.CreateSoilMoistureModelJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.CreateSoilMoistureModelJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -927,39 +916,38 @@ public async Task Example_CreateSoilMoistureModelJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateSoilMoistureModelJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetModelInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            ModelInference client = new FarmBeatsClient(credential).GetModelInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                sensorDataModelId = "<sensorDataModelId>",
-                sensorPartnerId = "<sensorPartnerId>",
-                inferenceStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                inferenceEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                satelliteProvider = "Microsoft",
-                satelliteSource = "Sentinel_2_L2A",
-                imageResolution = 123.45d,
-                imageFormat = "TIF",
-                modelVersion = "<modelVersion>",
-                sensorDefinition = new
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["sensorDataModelId"] = "<sensorDataModelId>",
+                ["sensorPartnerId"] = "<sensorPartnerId>",
+                ["inferenceStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["inferenceEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["satelliteProvider"] = "Microsoft",
+                ["satelliteSource"] = "Sentinel_2_L2A",
+                ["imageResolution"] = 123.45,
+                ["imageFormat"] = "TIF",
+                ["modelVersion"] = "<modelVersion>",
+                ["sensorDefinition"] = new Dictionary<string, object>()
                 {
-                    sensorMeasurement = "<sensorMeasurement>",
-                    minProperty = "<minProperty>",
-                    maxProperty = "<maxProperty>",
+                    ["sensorMeasurement"] = "<sensorMeasurement>",
+                    ["minProperty"] = "<minProperty>",
+                    ["maxProperty"] = "<maxProperty>",
                 },
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = await client.CreateSoilMoistureModelJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.CreateSoilMoistureModelJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -988,7 +976,7 @@ public async Task Example_CreateSoilMoistureModelJob_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
     }
 }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_NutrientAnalyses.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_NutrientAnalyses.cs
index 91c0a242ea5c..d77964154c3e 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_NutrientAnalyses.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_NutrientAnalyses.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_NutrientAnalyses
         [Ignore("Only validating compilation of examples")]
         public void Example_GetNutrientAnalysis()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetNutrientAnalysis("<partyId>", "<nutrientAnalysisId>", new RequestContext());
+            Response response = client.GetNutrientAnalysis("<partyId>", "<nutrientAnalysisId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,10 +36,10 @@ public void Example_GetNutrientAnalysis()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetNutrientAnalysis_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetNutrientAnalysis("<partyId>", "<nutrientAnalysisId>", new RequestContext());
+            Response response = client.GetNutrientAnalysis("<partyId>", "<nutrientAnalysisId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -64,17 +64,17 @@ public void Example_GetNutrientAnalysis_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetNutrientAnalysis_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetNutrientAnalysisAsync("<partyId>", "<nutrientAnalysisId>", new RequestContext());
+            Response response = await client.GetNutrientAnalysisAsync("<partyId>", "<nutrientAnalysisId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -84,10 +84,10 @@ public async Task Example_GetNutrientAnalysis_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetNutrientAnalysis_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetNutrientAnalysisAsync("<partyId>", "<nutrientAnalysisId>", new RequestContext());
+            Response response = await client.GetNutrientAnalysisAsync("<partyId>", "<nutrientAnalysisId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -112,19 +112,18 @@ public async Task Example_GetNutrientAnalysis_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<nutrientAnalysisId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<nutrientAnalysisId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -134,37 +133,38 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                parentId = "<parentId>",
-                parentType = "PlantTissueAnalysis",
-                unit = "<unit>",
-                value = 123.45d,
-                referenceValueLow = 123.45d,
-                referenceValueHigh = 123.45d,
-                classification = "<classification>",
-                recommendation = "<recommendation>",
-                products = new[] {
-        new {
-            rate = "<rate>",
-            instruction = "<instruction>",
-            product = "<product>",
-        }
-    },
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["parentId"] = "<parentId>",
+                ["parentType"] = "PlantTissueAnalysis",
+                ["unit"] = "<unit>",
+                ["value"] = 123.45,
+                ["referenceValueLow"] = 123.45,
+                ["referenceValueHigh"] = 123.45,
+                ["classification"] = "<classification>",
+                ["recommendation"] = "<recommendation>",
+                ["products"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["rate"] = "<rate>",
+["instruction"] = "<instruction>",
+["product"] = "<product>",
+}
+},
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<nutrientAnalysisId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<nutrientAnalysisId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -189,19 +189,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<nutrientAnalysisId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<nutrientAnalysisId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -211,37 +210,38 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                parentId = "<parentId>",
-                parentType = "PlantTissueAnalysis",
-                unit = "<unit>",
-                value = 123.45d,
-                referenceValueLow = 123.45d,
-                referenceValueHigh = 123.45d,
-                classification = "<classification>",
-                recommendation = "<recommendation>",
-                products = new[] {
-        new {
-            rate = "<rate>",
-            instruction = "<instruction>",
-            product = "<product>",
-        }
-    },
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["parentId"] = "<parentId>",
+                ["parentType"] = "PlantTissueAnalysis",
+                ["unit"] = "<unit>",
+                ["value"] = 123.45,
+                ["referenceValueLow"] = 123.45,
+                ["referenceValueHigh"] = 123.45,
+                ["classification"] = "<classification>",
+                ["recommendation"] = "<recommendation>",
+                ["products"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["rate"] = "<rate>",
+["instruction"] = "<instruction>",
+["product"] = "<product>",
+}
+},
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<nutrientAnalysisId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<nutrientAnalysisId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -266,15 +266,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<nutrientAnalysisId>");
             Console.WriteLine(response.Status);
@@ -284,8 +284,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<nutrientAnalysisId>");
             Console.WriteLine(response.Status);
@@ -295,8 +295,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<nutrientAnalysisId>");
             Console.WriteLine(response.Status);
@@ -306,8 +306,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<nutrientAnalysisId>");
             Console.WriteLine(response.Status);
@@ -317,13 +317,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetNutrientAnalyses()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetNutrientAnalyses("<parentType>", new string[] { "<parentIds>" }, new string[] { "<classifications>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetNutrientAnalyses(null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -331,35 +331,53 @@ public void Example_GetNutrientAnalyses()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetNutrientAnalyses_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetNutrientAnalyses("<parentType>", new string[] { "<parentIds>" }, new string[] { "<classifications>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetNutrientAnalyses("<parentType>", new List<string>()
+{
+"<parentIds>"
+}, new List<string>()
+{
+"<classifications>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("parentType").ToString());
-                Console.WriteLine(result.GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("referenceValueLow").ToString());
-                Console.WriteLine(result.GetProperty("referenceValueHigh").ToString());
-                Console.WriteLine(result.GetProperty("classification").ToString());
-                Console.WriteLine(result.GetProperty("recommendation").ToString());
-                Console.WriteLine(result.GetProperty("products")[0].GetProperty("rate").ToString());
-                Console.WriteLine(result.GetProperty("products")[0].GetProperty("instruction").ToString());
-                Console.WriteLine(result.GetProperty("products")[0].GetProperty("product").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentType").ToString());
+                Console.WriteLine(result[0].GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("referenceValueLow").ToString());
+                Console.WriteLine(result[0].GetProperty("referenceValueHigh").ToString());
+                Console.WriteLine(result[0].GetProperty("classification").ToString());
+                Console.WriteLine(result[0].GetProperty("recommendation").ToString());
+                Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("rate").ToString());
+                Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("instruction").ToString());
+                Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("product").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -367,13 +385,13 @@ public void Example_GetNutrientAnalyses_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetNutrientAnalyses_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetNutrientAnalysesAsync("<parentType>", new string[] { "<parentIds>" }, new string[] { "<classifications>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetNutrientAnalysesAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -381,35 +399,53 @@ public async Task Example_GetNutrientAnalyses_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetNutrientAnalyses_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetNutrientAnalysesAsync("<parentType>", new string[] { "<parentIds>" }, new string[] { "<classifications>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetNutrientAnalysesAsync("<parentType>", new List<string>()
+{
+"<parentIds>"
+}, new List<string>()
+{
+"<classifications>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("parentType").ToString());
-                Console.WriteLine(result.GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("referenceValueLow").ToString());
-                Console.WriteLine(result.GetProperty("referenceValueHigh").ToString());
-                Console.WriteLine(result.GetProperty("classification").ToString());
-                Console.WriteLine(result.GetProperty("recommendation").ToString());
-                Console.WriteLine(result.GetProperty("products")[0].GetProperty("rate").ToString());
-                Console.WriteLine(result.GetProperty("products")[0].GetProperty("instruction").ToString());
-                Console.WriteLine(result.GetProperty("products")[0].GetProperty("product").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentType").ToString());
+                Console.WriteLine(result[0].GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("referenceValueLow").ToString());
+                Console.WriteLine(result[0].GetProperty("referenceValueHigh").ToString());
+                Console.WriteLine(result[0].GetProperty("classification").ToString());
+                Console.WriteLine(result[0].GetProperty("recommendation").ToString());
+                Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("rate").ToString());
+                Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("instruction").ToString());
+                Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("product").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -417,13 +453,13 @@ public async Task Example_GetNutrientAnalyses_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetNutrientAnalysesByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetNutrientAnalysesByPartyId("<partyId>", "<parentType>", new string[] { "<parentIds>" }, new string[] { "<classifications>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetNutrientAnalysesByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -431,35 +467,53 @@ public void Example_GetNutrientAnalysesByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetNutrientAnalysesByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetNutrientAnalysesByPartyId("<partyId>", "<parentType>", new string[] { "<parentIds>" }, new string[] { "<classifications>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetNutrientAnalysesByPartyId("<partyId>", "<parentType>", new List<string>()
+{
+"<parentIds>"
+}, new List<string>()
+{
+"<classifications>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("parentType").ToString());
-                Console.WriteLine(result.GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("referenceValueLow").ToString());
-                Console.WriteLine(result.GetProperty("referenceValueHigh").ToString());
-                Console.WriteLine(result.GetProperty("classification").ToString());
-                Console.WriteLine(result.GetProperty("recommendation").ToString());
-                Console.WriteLine(result.GetProperty("products")[0].GetProperty("rate").ToString());
-                Console.WriteLine(result.GetProperty("products")[0].GetProperty("instruction").ToString());
-                Console.WriteLine(result.GetProperty("products")[0].GetProperty("product").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentType").ToString());
+                Console.WriteLine(result[0].GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("referenceValueLow").ToString());
+                Console.WriteLine(result[0].GetProperty("referenceValueHigh").ToString());
+                Console.WriteLine(result[0].GetProperty("classification").ToString());
+                Console.WriteLine(result[0].GetProperty("recommendation").ToString());
+                Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("rate").ToString());
+                Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("instruction").ToString());
+                Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("product").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -467,13 +521,13 @@ public void Example_GetNutrientAnalysesByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetNutrientAnalysesByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetNutrientAnalysesByPartyIdAsync("<partyId>", "<parentType>", new string[] { "<parentIds>" }, new string[] { "<classifications>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetNutrientAnalysesByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -481,35 +535,53 @@ public async Task Example_GetNutrientAnalysesByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetNutrientAnalysesByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetNutrientAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            NutrientAnalyses client = new FarmBeatsClient(credential).GetNutrientAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetNutrientAnalysesByPartyIdAsync("<partyId>", "<parentType>", new string[] { "<parentIds>" }, new string[] { "<classifications>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetNutrientAnalysesByPartyIdAsync("<partyId>", "<parentType>", new List<string>()
+{
+"<parentIds>"
+}, new List<string>()
+{
+"<classifications>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("parentType").ToString());
-                Console.WriteLine(result.GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("referenceValueLow").ToString());
-                Console.WriteLine(result.GetProperty("referenceValueHigh").ToString());
-                Console.WriteLine(result.GetProperty("classification").ToString());
-                Console.WriteLine(result.GetProperty("recommendation").ToString());
-                Console.WriteLine(result.GetProperty("products")[0].GetProperty("rate").ToString());
-                Console.WriteLine(result.GetProperty("products")[0].GetProperty("instruction").ToString());
-                Console.WriteLine(result.GetProperty("products")[0].GetProperty("product").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("parentType").ToString());
+                Console.WriteLine(result[0].GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("referenceValueLow").ToString());
+                Console.WriteLine(result[0].GetProperty("referenceValueHigh").ToString());
+                Console.WriteLine(result[0].GetProperty("classification").ToString());
+                Console.WriteLine(result[0].GetProperty("recommendation").ToString());
+                Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("rate").ToString());
+                Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("instruction").ToString());
+                Console.WriteLine(result[0].GetProperty("products")[0].GetProperty("product").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
     }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_OAuthProviders.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_OAuthProviders.cs
index b32e17b2ea43..3d287952df37 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_OAuthProviders.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_OAuthProviders.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_OAuthProviders
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOAuthProvider()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetOAuthProvider("<oauthProviderId>", new RequestContext());
+            Response response = client.GetOAuthProvider("<oauthProviderId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,10 +36,10 @@ public void Example_GetOAuthProvider()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOAuthProvider_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetOAuthProvider("<oauthProviderId>", new RequestContext());
+            Response response = client.GetOAuthProvider("<oauthProviderId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("appId").ToString());
@@ -54,17 +54,17 @@ public void Example_GetOAuthProvider_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOAuthProvider_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetOAuthProviderAsync("<oauthProviderId>", new RequestContext());
+            Response response = await client.GetOAuthProviderAsync("<oauthProviderId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -74,10 +74,10 @@ public async Task Example_GetOAuthProvider_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOAuthProvider_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetOAuthProviderAsync("<oauthProviderId>", new RequestContext());
+            Response response = await client.GetOAuthProviderAsync("<oauthProviderId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("appId").ToString());
@@ -92,19 +92,18 @@ public async Task Example_GetOAuthProvider_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<oauthProviderId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<oauthProviderId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -114,24 +113,23 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                appId = "<appId>",
-                appSecret = "<appSecret>",
-                apiKey = "<apiKey>",
-                isProductionApp = true,
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["appId"] = "<appId>",
+                ["appSecret"] = "<appSecret>",
+                ["apiKey"] = "<apiKey>",
+                ["isProductionApp"] = true,
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<oauthProviderId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<oauthProviderId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("appId").ToString());
@@ -146,19 +144,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<oauthProviderId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<oauthProviderId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -168,24 +165,23 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                appId = "<appId>",
-                appSecret = "<appSecret>",
-                apiKey = "<apiKey>",
-                isProductionApp = true,
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["appId"] = "<appId>",
+                ["appSecret"] = "<appSecret>",
+                ["apiKey"] = "<apiKey>",
+                ["isProductionApp"] = true,
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<oauthProviderId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<oauthProviderId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("appId").ToString());
@@ -200,15 +196,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<oauthProviderId>");
             Console.WriteLine(response.Status);
@@ -218,8 +214,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<oauthProviderId>");
             Console.WriteLine(response.Status);
@@ -229,8 +225,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<oauthProviderId>");
             Console.WriteLine(response.Status);
@@ -240,8 +236,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<oauthProviderId>");
             Console.WriteLine(response.Status);
@@ -251,10 +247,10 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
@@ -264,10 +260,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
@@ -284,17 +280,17 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
@@ -304,10 +300,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
@@ -324,20 +320,20 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOAuthProviders()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetOAuthProviders(new string[] { "<providerIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetOAuthProviders(null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -345,25 +341,37 @@ public void Example_GetOAuthProviders()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOAuthProviders_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetOAuthProviders(new string[] { "<providerIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetOAuthProviders(new List<string>()
+{
+"<providerIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("appId").ToString());
-                Console.WriteLine(result.GetProperty("appSecret").ToString());
-                Console.WriteLine(result.GetProperty("apiKey").ToString());
-                Console.WriteLine(result.GetProperty("isProductionApp").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("appId").ToString());
+                Console.WriteLine(result[0].GetProperty("appSecret").ToString());
+                Console.WriteLine(result[0].GetProperty("apiKey").ToString());
+                Console.WriteLine(result[0].GetProperty("isProductionApp").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -371,13 +379,13 @@ public void Example_GetOAuthProviders_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOAuthProviders_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetOAuthProvidersAsync(new string[] { "<providerIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetOAuthProvidersAsync(null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -385,25 +393,37 @@ public async Task Example_GetOAuthProviders_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOAuthProviders_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetOAuthProvidersAsync(new string[] { "<providerIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetOAuthProvidersAsync(new List<string>()
+{
+"<providerIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("appId").ToString());
-                Console.WriteLine(result.GetProperty("appSecret").ToString());
-                Console.WriteLine(result.GetProperty("apiKey").ToString());
-                Console.WriteLine(result.GetProperty("isProductionApp").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("appId").ToString());
+                Console.WriteLine(result[0].GetProperty("appSecret").ToString());
+                Console.WriteLine(result[0].GetProperty("apiKey").ToString());
+                Console.WriteLine(result[0].GetProperty("isProductionApp").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -411,12 +431,12 @@ public async Task Example_GetOAuthProviders_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<oauthProviderId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<oauthProviderId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
         }
@@ -425,12 +445,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<oauthProviderId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<oauthProviderId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -446,19 +466,19 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<oauthProviderId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<oauthProviderId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
         }
@@ -467,12 +487,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetOAuthProvidersClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<oauthProviderId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            OAuthProviders client = new FarmBeatsClient(credential).GetOAuthProvidersClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<oauthProviderId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("oauthProviderId").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -488,7 +508,7 @@ public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
     }
 }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Parties.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Parties.cs
index b06e35f2e3ca..a5fd68cfcdcb 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Parties.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Parties.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_Parties
         [Ignore("Only validating compilation of examples")]
         public void Example_GetParty()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetParty("<partyId>", new RequestContext());
+            Response response = client.GetParty("<partyId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,10 +36,10 @@ public void Example_GetParty()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetParty_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetParty("<partyId>", new RequestContext());
+            Response response = client.GetParty("<partyId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -52,17 +52,17 @@ public void Example_GetParty_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetParty_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetPartyAsync("<partyId>", new RequestContext());
+            Response response = await client.GetPartyAsync("<partyId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -72,10 +72,10 @@ public async Task Example_GetParty_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetParty_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetPartyAsync("<partyId>", new RequestContext());
+            Response response = await client.GetPartyAsync("<partyId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -88,19 +88,18 @@ public async Task Example_GetParty_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -110,22 +109,21 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -138,19 +136,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -160,22 +157,21 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -188,15 +184,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>");
             Console.WriteLine(response.Status);
@@ -206,8 +202,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>");
             Console.WriteLine(response.Status);
@@ -217,8 +213,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>");
             Console.WriteLine(response.Status);
@@ -228,8 +224,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>");
             Console.WriteLine(response.Status);
@@ -239,10 +235,10 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -254,10 +250,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -278,10 +274,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -293,10 +289,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -317,13 +313,13 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetParties()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetParties(new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetParties(null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -331,23 +327,35 @@ public void Example_GetParties()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetParties_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetParties(new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetParties(new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -355,13 +363,13 @@ public void Example_GetParties_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetParties_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetPartiesAsync(new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPartiesAsync(null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -369,23 +377,35 @@ public async Task Example_GetParties_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetParties_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetPartiesAsync(new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPartiesAsync(new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -393,12 +413,12 @@ public async Task Example_GetParties_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -409,12 +429,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -434,12 +454,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -450,12 +470,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPartiesClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Parties client = new FarmBeatsClient(credential).GetPartiesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_PlantTissueAnalyses.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_PlantTissueAnalyses.cs
index 6396d6d6b537..65b5bb71ba3d 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_PlantTissueAnalyses.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_PlantTissueAnalyses.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_PlantTissueAnalyses
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPlantTissueAnalysis()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetPlantTissueAnalysis("<partyId>", "<plantTissueAnalysisId>", new RequestContext());
+            Response response = client.GetPlantTissueAnalysis("<partyId>", "<plantTissueAnalysisId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,10 +36,10 @@ public void Example_GetPlantTissueAnalysis()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPlantTissueAnalysis_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetPlantTissueAnalysis("<partyId>", "<plantTissueAnalysisId>", new RequestContext());
+            Response response = client.GetPlantTissueAnalysis("<partyId>", "<plantTissueAnalysisId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -71,17 +71,17 @@ public void Example_GetPlantTissueAnalysis_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPlantTissueAnalysis_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetPlantTissueAnalysisAsync("<partyId>", "<plantTissueAnalysisId>", new RequestContext());
+            Response response = await client.GetPlantTissueAnalysisAsync("<partyId>", "<plantTissueAnalysisId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -91,10 +91,10 @@ public async Task Example_GetPlantTissueAnalysis_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPlantTissueAnalysis_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetPlantTissueAnalysisAsync("<partyId>", "<plantTissueAnalysisId>", new RequestContext());
+            Response response = await client.GetPlantTissueAnalysisAsync("<partyId>", "<plantTissueAnalysisId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -126,19 +126,18 @@ public async Task Example_GetPlantTissueAnalysis_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<plantTissueAnalysisId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<plantTissueAnalysisId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -148,42 +147,41 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                fieldId = "<fieldId>",
-                cropId = "<cropId>",
-                cropProductId = "<cropProductId>",
-                seasonId = "<seasonId>",
-                plantingDateTime = "2022-05-10T18:57:31.2311892Z",
-                growthStage = "<growthStage>",
-                plantPart = "<plantPart>",
-                plantPosition = "<plantPosition>",
-                plantAppearance = "<plantAppearance>",
-                sampleCollectionCondition = "<sampleCollectionCondition>",
-                sampleCollectionDateTime = "2022-05-10T18:57:31.2311892Z",
-                sampleReceivedDateTime = "2022-05-10T18:57:31.2311892Z",
-                sampleTestResultDateTime = "2022-05-10T18:57:31.2311892Z",
-                labDetails = new
+                ["fieldId"] = "<fieldId>",
+                ["cropId"] = "<cropId>",
+                ["cropProductId"] = "<cropProductId>",
+                ["seasonId"] = "<seasonId>",
+                ["plantingDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["growthStage"] = "<growthStage>",
+                ["plantPart"] = "<plantPart>",
+                ["plantPosition"] = "<plantPosition>",
+                ["plantAppearance"] = "<plantAppearance>",
+                ["sampleCollectionCondition"] = "<sampleCollectionCondition>",
+                ["sampleCollectionDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["sampleReceivedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["sampleTestResultDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["labDetails"] = new Dictionary<string, object>()
                 {
-                    code = "<code>",
-                    name = "<name>",
-                    description = "<description>",
-                    address = "<address>",
+                    ["code"] = "<code>",
+                    ["name"] = "<name>",
+                    ["description"] = "<description>",
+                    ["address"] = "<address>",
                 },
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<plantTissueAnalysisId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<plantTissueAnalysisId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -215,19 +213,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantTissueAnalysisId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantTissueAnalysisId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -237,42 +234,41 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                fieldId = "<fieldId>",
-                cropId = "<cropId>",
-                cropProductId = "<cropProductId>",
-                seasonId = "<seasonId>",
-                plantingDateTime = "2022-05-10T18:57:31.2311892Z",
-                growthStage = "<growthStage>",
-                plantPart = "<plantPart>",
-                plantPosition = "<plantPosition>",
-                plantAppearance = "<plantAppearance>",
-                sampleCollectionCondition = "<sampleCollectionCondition>",
-                sampleCollectionDateTime = "2022-05-10T18:57:31.2311892Z",
-                sampleReceivedDateTime = "2022-05-10T18:57:31.2311892Z",
-                sampleTestResultDateTime = "2022-05-10T18:57:31.2311892Z",
-                labDetails = new
+                ["fieldId"] = "<fieldId>",
+                ["cropId"] = "<cropId>",
+                ["cropProductId"] = "<cropProductId>",
+                ["seasonId"] = "<seasonId>",
+                ["plantingDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["growthStage"] = "<growthStage>",
+                ["plantPart"] = "<plantPart>",
+                ["plantPosition"] = "<plantPosition>",
+                ["plantAppearance"] = "<plantAppearance>",
+                ["sampleCollectionCondition"] = "<sampleCollectionCondition>",
+                ["sampleCollectionDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["sampleReceivedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["sampleTestResultDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["labDetails"] = new Dictionary<string, object>()
                 {
-                    code = "<code>",
-                    name = "<name>",
-                    description = "<description>",
-                    address = "<address>",
+                    ["code"] = "<code>",
+                    ["name"] = "<name>",
+                    ["description"] = "<description>",
+                    ["address"] = "<address>",
                 },
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantTissueAnalysisId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantTissueAnalysisId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -304,15 +300,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<plantTissueAnalysisId>");
             Console.WriteLine(response.Status);
@@ -322,8 +318,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<plantTissueAnalysisId>");
             Console.WriteLine(response.Status);
@@ -333,8 +329,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<plantTissueAnalysisId>");
             Console.WriteLine(response.Status);
@@ -344,8 +340,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<plantTissueAnalysisId>");
             Console.WriteLine(response.Status);
@@ -355,10 +351,10 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -370,10 +366,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -394,10 +390,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -409,10 +405,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -433,13 +429,13 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPlantTissueAnalysesByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetPlantTissueAnalysesByPartyId("<partyId>", new string[] { "<seasonIds>" }, new string[] { "<cropIds>" }, new string[] { "<cropProductsIds>" }, new string[] { "<fieldIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetPlantTissueAnalysesByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -447,42 +443,66 @@ public void Example_GetPlantTissueAnalysesByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPlantTissueAnalysesByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetPlantTissueAnalysesByPartyId("<partyId>", new string[] { "<seasonIds>" }, new string[] { "<cropIds>" }, new string[] { "<cropProductsIds>" }, new string[] { "<fieldIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetPlantTissueAnalysesByPartyId("<partyId>", new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<cropProductsIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("cropProductId").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("plantingDateTime").ToString());
-                Console.WriteLine(result.GetProperty("growthStage").ToString());
-                Console.WriteLine(result.GetProperty("plantPart").ToString());
-                Console.WriteLine(result.GetProperty("plantPosition").ToString());
-                Console.WriteLine(result.GetProperty("plantAppearance").ToString());
-                Console.WriteLine(result.GetProperty("sampleCollectionCondition").ToString());
-                Console.WriteLine(result.GetProperty("sampleCollectionDateTime").ToString());
-                Console.WriteLine(result.GetProperty("sampleReceivedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("sampleTestResultDateTime").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("address").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropProductId").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("growthStage").ToString());
+                Console.WriteLine(result[0].GetProperty("plantPart").ToString());
+                Console.WriteLine(result[0].GetProperty("plantPosition").ToString());
+                Console.WriteLine(result[0].GetProperty("plantAppearance").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleCollectionCondition").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleCollectionDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleReceivedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleTestResultDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("address").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -490,13 +510,13 @@ public void Example_GetPlantTissueAnalysesByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPlantTissueAnalysesByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetPlantTissueAnalysesByPartyIdAsync("<partyId>", new string[] { "<seasonIds>" }, new string[] { "<cropIds>" }, new string[] { "<cropProductsIds>" }, new string[] { "<fieldIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPlantTissueAnalysesByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -504,42 +524,66 @@ public async Task Example_GetPlantTissueAnalysesByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPlantTissueAnalysesByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetPlantTissueAnalysesByPartyIdAsync("<partyId>", new string[] { "<seasonIds>" }, new string[] { "<cropIds>" }, new string[] { "<cropProductsIds>" }, new string[] { "<fieldIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPlantTissueAnalysesByPartyIdAsync("<partyId>", new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<cropProductsIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("cropProductId").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("plantingDateTime").ToString());
-                Console.WriteLine(result.GetProperty("growthStage").ToString());
-                Console.WriteLine(result.GetProperty("plantPart").ToString());
-                Console.WriteLine(result.GetProperty("plantPosition").ToString());
-                Console.WriteLine(result.GetProperty("plantAppearance").ToString());
-                Console.WriteLine(result.GetProperty("sampleCollectionCondition").ToString());
-                Console.WriteLine(result.GetProperty("sampleCollectionDateTime").ToString());
-                Console.WriteLine(result.GetProperty("sampleReceivedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("sampleTestResultDateTime").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("address").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropProductId").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("growthStage").ToString());
+                Console.WriteLine(result[0].GetProperty("plantPart").ToString());
+                Console.WriteLine(result[0].GetProperty("plantPosition").ToString());
+                Console.WriteLine(result[0].GetProperty("plantAppearance").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleCollectionCondition").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleCollectionDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleReceivedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleTestResultDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("address").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -547,13 +591,13 @@ public async Task Example_GetPlantTissueAnalysesByPartyId_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPlantTissueAnalyses()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetPlantTissueAnalyses(new string[] { "<seasonIds>" }, new string[] { "<cropIds>" }, new string[] { "<cropProductsIds>" }, new string[] { "<fieldIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetPlantTissueAnalyses(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -561,42 +605,66 @@ public void Example_GetPlantTissueAnalyses()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPlantTissueAnalyses_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetPlantTissueAnalyses(new string[] { "<seasonIds>" }, new string[] { "<cropIds>" }, new string[] { "<cropProductsIds>" }, new string[] { "<fieldIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetPlantTissueAnalyses(new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<cropProductsIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("cropProductId").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("plantingDateTime").ToString());
-                Console.WriteLine(result.GetProperty("growthStage").ToString());
-                Console.WriteLine(result.GetProperty("plantPart").ToString());
-                Console.WriteLine(result.GetProperty("plantPosition").ToString());
-                Console.WriteLine(result.GetProperty("plantAppearance").ToString());
-                Console.WriteLine(result.GetProperty("sampleCollectionCondition").ToString());
-                Console.WriteLine(result.GetProperty("sampleCollectionDateTime").ToString());
-                Console.WriteLine(result.GetProperty("sampleReceivedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("sampleTestResultDateTime").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("address").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropProductId").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("growthStage").ToString());
+                Console.WriteLine(result[0].GetProperty("plantPart").ToString());
+                Console.WriteLine(result[0].GetProperty("plantPosition").ToString());
+                Console.WriteLine(result[0].GetProperty("plantAppearance").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleCollectionCondition").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleCollectionDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleReceivedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleTestResultDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("address").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -604,13 +672,13 @@ public void Example_GetPlantTissueAnalyses_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPlantTissueAnalyses_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetPlantTissueAnalysesAsync(new string[] { "<seasonIds>" }, new string[] { "<cropIds>" }, new string[] { "<cropProductsIds>" }, new string[] { "<fieldIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPlantTissueAnalysesAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -618,42 +686,66 @@ public async Task Example_GetPlantTissueAnalyses_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPlantTissueAnalyses_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetPlantTissueAnalysesAsync(new string[] { "<seasonIds>" }, new string[] { "<cropIds>" }, new string[] { "<cropProductsIds>" }, new string[] { "<fieldIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPlantTissueAnalysesAsync(new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<cropProductsIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("cropProductId").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("plantingDateTime").ToString());
-                Console.WriteLine(result.GetProperty("growthStage").ToString());
-                Console.WriteLine(result.GetProperty("plantPart").ToString());
-                Console.WriteLine(result.GetProperty("plantPosition").ToString());
-                Console.WriteLine(result.GetProperty("plantAppearance").ToString());
-                Console.WriteLine(result.GetProperty("sampleCollectionCondition").ToString());
-                Console.WriteLine(result.GetProperty("sampleCollectionDateTime").ToString());
-                Console.WriteLine(result.GetProperty("sampleReceivedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("sampleTestResultDateTime").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("labDetails").GetProperty("address").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropProductId").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("growthStage").ToString());
+                Console.WriteLine(result[0].GetProperty("plantPart").ToString());
+                Console.WriteLine(result[0].GetProperty("plantPosition").ToString());
+                Console.WriteLine(result[0].GetProperty("plantAppearance").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleCollectionCondition").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleCollectionDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleReceivedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("sampleTestResultDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("labDetails").GetProperty("address").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -661,12 +753,12 @@ public async Task Example_GetPlantTissueAnalyses_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantTissueAnalysisId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantTissueAnalysisId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -677,12 +769,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantTissueAnalysisId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantTissueAnalysisId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -702,12 +794,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantTissueAnalysisId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantTissueAnalysisId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -718,12 +810,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantTissueAnalysisId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantTissueAnalyses client = new FarmBeatsClient(credential).GetPlantTissueAnalysesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantTissueAnalysisId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_PlantingData.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_PlantingData.cs
index f4c339a465b7..5648dc4e4d6e 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_PlantingData.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_PlantingData.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_PlantingData
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPlantingData()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetPlantingData("<partyId>", "<plantingDataId>", new RequestContext());
+            Response response = client.GetPlantingData("<partyId>", "<plantingDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,10 +36,10 @@ public void Example_GetPlantingData()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPlantingData_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetPlantingData("<partyId>", "<plantingDataId>", new RequestContext());
+            Response response = client.GetPlantingData("<partyId>", "<plantingDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
@@ -73,17 +73,17 @@ public void Example_GetPlantingData_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPlantingData_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetPlantingDataAsync("<partyId>", "<plantingDataId>", new RequestContext());
+            Response response = await client.GetPlantingDataAsync("<partyId>", "<plantingDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -93,10 +93,10 @@ public async Task Example_GetPlantingData_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPlantingData_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetPlantingDataAsync("<partyId>", "<plantingDataId>", new RequestContext());
+            Response response = await client.GetPlantingDataAsync("<partyId>", "<plantingDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
@@ -130,19 +130,18 @@ public async Task Example_GetPlantingData_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<plantingDataId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<plantingDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -152,63 +151,49 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                avgPlantingRate = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                totalMaterial = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                avgMaterial = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                plantingProductDetails = new[] {
-        new {
-            productName = "<productName>",
-            area = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-        }
-    },
-                area = new
+                ["avgPlantingRate"] = new Dictionary<string, object>()
                 {
-                    unit = "<unit>",
-                    value = 123.45d,
+                    ["unit"] = "<unit>",
+                    ["value"] = 123.45,
                 },
-                operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                associatedBoundaryId = "<associatedBoundaryId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["totalMaterial"] = null
+            ,
+                ["avgMaterial"] = null
+            ,
+                ["plantingProductDetails"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["productName"] = "<productName>",
+["area"] = null
+,
+["totalMaterial"] = null
+,
+["avgMaterial"] = null
+,
+}
+},
+                ["area"] = null
+            ,
+                ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["associatedBoundaryId"] = "<associatedBoundaryId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<plantingDataId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<plantingDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
@@ -242,19 +227,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantingDataId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantingDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -264,63 +248,49 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                avgPlantingRate = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                totalMaterial = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                avgMaterial = new
+                ["avgPlantingRate"] = new Dictionary<string, object>()
                 {
-                    unit = "<unit>",
-                    value = 123.45d,
+                    ["unit"] = "<unit>",
+                    ["value"] = 123.45,
                 },
-                plantingProductDetails = new[] {
-        new {
-            productName = "<productName>",
-            area = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            totalMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-            avgMaterial = new {
-                unit = "<unit>",
-                value = 123.45d,
-            },
-        }
-    },
-                area = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                associatedBoundaryId = "<associatedBoundaryId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["totalMaterial"] = null
+            ,
+                ["avgMaterial"] = null
+            ,
+                ["plantingProductDetails"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["productName"] = "<productName>",
+["area"] = null
+,
+["totalMaterial"] = null
+,
+["avgMaterial"] = null
+,
+}
+},
+                ["area"] = null
+            ,
+                ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["associatedBoundaryId"] = "<associatedBoundaryId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantingDataId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<plantingDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
@@ -354,15 +324,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<plantingDataId>");
             Console.WriteLine(response.Status);
@@ -372,8 +342,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<plantingDataId>");
             Console.WriteLine(response.Status);
@@ -383,8 +353,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<plantingDataId>");
             Console.WriteLine(response.Status);
@@ -394,8 +364,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<plantingDataId>");
             Console.WriteLine(response.Status);
@@ -405,10 +375,10 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -420,10 +390,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -444,10 +414,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -459,10 +429,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -483,13 +453,13 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllPlantingDataByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllPlantingDataByPartyId("<partyId>", 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllPlantingDataByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -497,44 +467,62 @@ public void Example_GetAllPlantingDataByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllPlantingDataByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllPlantingDataByPartyId("<partyId>", 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllPlantingDataByPartyId("<partyId>", 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -542,13 +530,13 @@ public void Example_GetAllPlantingDataByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllPlantingDataByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllPlantingDataByPartyIdAsync("<partyId>", 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllPlantingDataByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -556,44 +544,62 @@ public async Task Example_GetAllPlantingDataByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllPlantingDataByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllPlantingDataByPartyIdAsync("<partyId>", 3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllPlantingDataByPartyIdAsync("<partyId>", 123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -601,13 +607,13 @@ public async Task Example_GetAllPlantingDataByPartyId_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllPlantingData()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllPlantingData(3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<plantingDataIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllPlantingData(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -615,44 +621,62 @@ public void Example_GetAllPlantingData()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllPlantingData_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllPlantingData(3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<plantingDataIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllPlantingData(123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<plantingDataIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -660,13 +684,13 @@ public void Example_GetAllPlantingData_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllPlantingData_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllPlantingDataAsync(3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<plantingDataIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllPlantingDataAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -674,44 +698,62 @@ public async Task Example_GetAllPlantingData_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllPlantingData_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllPlantingDataAsync(3.14, 3.14, 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<plantingDataIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllPlantingDataAsync(123.45, 123.45, 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<plantingDataIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgPlantingRate").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgPlantingRate").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("totalMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("plantingProductDetails")[0].GetProperty("avgMaterial").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -719,12 +761,12 @@ public async Task Example_GetAllPlantingData_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantingDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantingDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -735,12 +777,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantingDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantingDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -760,12 +802,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantingDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantingDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -776,12 +818,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPlantingDataClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantingDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            PlantingData client = new FarmBeatsClient(credential).GetPlantingDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<plantingDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_PrescriptionMaps.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_PrescriptionMaps.cs
index fbc65e295cc6..e47b723c386d 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_PrescriptionMaps.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_PrescriptionMaps.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_PrescriptionMaps
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPrescriptionMap()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetPrescriptionMap("<partyId>", "<prescriptionMapId>", new RequestContext());
+            Response response = client.GetPrescriptionMap("<partyId>", "<prescriptionMapId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,10 +36,10 @@ public void Example_GetPrescriptionMap()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPrescriptionMap_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetPrescriptionMap("<partyId>", "<prescriptionMapId>", new RequestContext());
+            Response response = client.GetPrescriptionMap("<partyId>", "<prescriptionMapId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -57,17 +57,17 @@ public void Example_GetPrescriptionMap_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPrescriptionMap_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetPrescriptionMapAsync("<partyId>", "<prescriptionMapId>", new RequestContext());
+            Response response = await client.GetPrescriptionMapAsync("<partyId>", "<prescriptionMapId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -77,10 +77,10 @@ public async Task Example_GetPrescriptionMap_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPrescriptionMap_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetPrescriptionMapAsync("<partyId>", "<prescriptionMapId>", new RequestContext());
+            Response response = await client.GetPrescriptionMapAsync("<partyId>", "<prescriptionMapId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -98,19 +98,18 @@ public async Task Example_GetPrescriptionMap_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<prescriptionMapId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<prescriptionMapId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -120,26 +119,25 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                type = "<type>",
-                seasonId = "<seasonId>",
-                cropId = "<cropId>",
-                fieldId = "<fieldId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["type"] = "<type>",
+                ["seasonId"] = "<seasonId>",
+                ["cropId"] = "<cropId>",
+                ["fieldId"] = "<fieldId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<prescriptionMapId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<prescriptionMapId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -157,19 +155,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionMapId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionMapId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -179,26 +176,25 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                type = "<type>",
-                seasonId = "<seasonId>",
-                cropId = "<cropId>",
-                fieldId = "<fieldId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["type"] = "<type>",
+                ["seasonId"] = "<seasonId>",
+                ["cropId"] = "<cropId>",
+                ["fieldId"] = "<fieldId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionMapId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionMapId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -216,15 +212,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<prescriptionMapId>");
             Console.WriteLine(response.Status);
@@ -234,8 +230,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<prescriptionMapId>");
             Console.WriteLine(response.Status);
@@ -245,8 +241,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<prescriptionMapId>");
             Console.WriteLine(response.Status);
@@ -256,8 +252,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<prescriptionMapId>");
             Console.WriteLine(response.Status);
@@ -267,10 +263,10 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -282,10 +278,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -306,10 +302,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -321,10 +317,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -345,13 +341,13 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPrescriptionMapsByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetPrescriptionMapsByPartyId("<partyId>", new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetPrescriptionMapsByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -359,28 +355,55 @@ public void Example_GetPrescriptionMapsByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPrescriptionMapsByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetPrescriptionMapsByPartyId("<partyId>", new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetPrescriptionMapsByPartyId("<partyId>", new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -388,13 +411,13 @@ public void Example_GetPrescriptionMapsByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPrescriptionMapsByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetPrescriptionMapsByPartyIdAsync("<partyId>", new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPrescriptionMapsByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -402,28 +425,55 @@ public async Task Example_GetPrescriptionMapsByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPrescriptionMapsByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetPrescriptionMapsByPartyIdAsync("<partyId>", new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPrescriptionMapsByPartyIdAsync("<partyId>", new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -431,13 +481,13 @@ public async Task Example_GetPrescriptionMapsByPartyId_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPrescriptionMaps()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetPrescriptionMaps(new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetPrescriptionMaps(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -445,28 +495,55 @@ public void Example_GetPrescriptionMaps()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPrescriptionMaps_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetPrescriptionMaps(new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetPrescriptionMaps(new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -474,13 +551,13 @@ public void Example_GetPrescriptionMaps_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPrescriptionMaps_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetPrescriptionMapsAsync(new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPrescriptionMapsAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -488,28 +565,55 @@ public async Task Example_GetPrescriptionMaps_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPrescriptionMaps_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetPrescriptionMapsAsync(new string[] { "<types>" }, new string[] { "<cropIds>" }, new string[] { "<seasonIds>" }, new string[] { "<fieldIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPrescriptionMapsAsync(new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -517,12 +621,12 @@ public async Task Example_GetPrescriptionMaps_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionMapId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionMapId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -533,12 +637,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionMapId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionMapId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -558,12 +662,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionMapId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionMapId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -574,12 +678,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionMapsClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionMapId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            PrescriptionMaps client = new FarmBeatsClient(credential).GetPrescriptionMapsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionMapId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Prescriptions.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Prescriptions.cs
index 8f891e3171d3..26ee6aee138d 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Prescriptions.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Prescriptions.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_Prescriptions
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPrescription()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetPrescription("<partyId>", "<prescriptionId>", new RequestContext());
+            Response response = client.GetPrescription("<partyId>", "<prescriptionId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,10 +36,10 @@ public void Example_GetPrescription()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPrescription_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetPrescription("<partyId>", "<prescriptionId>", new RequestContext());
+            Response response = client.GetPrescription("<partyId>", "<prescriptionId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -47,8 +47,8 @@ public void Example_GetPrescription_AllParameters()
             Console.WriteLine(result.GetProperty("productCode").ToString());
             Console.WriteLine(result.GetProperty("productName").ToString());
             Console.WriteLine(result.GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("eTag").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -59,17 +59,17 @@ public void Example_GetPrescription_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPrescription_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetPrescriptionAsync("<partyId>", "<prescriptionId>", new RequestContext());
+            Response response = await client.GetPrescriptionAsync("<partyId>", "<prescriptionId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -79,10 +79,10 @@ public async Task Example_GetPrescription_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPrescription_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetPrescriptionAsync("<partyId>", "<prescriptionId>", new RequestContext());
+            Response response = await client.GetPrescriptionAsync("<partyId>", "<prescriptionId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -90,8 +90,8 @@ public async Task Example_GetPrescription_AllParameters_Async()
             Console.WriteLine(result.GetProperty("productCode").ToString());
             Console.WriteLine(result.GetProperty("productName").ToString());
             Console.WriteLine(result.GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("eTag").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -102,19 +102,18 @@ public async Task Example_GetPrescription_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<prescriptionId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<prescriptionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -124,34 +123,33 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                prescriptionMapId = "<prescriptionMapId>",
-                productCode = "<productCode>",
-                productName = "<productName>",
-                type = "<type>",
-                measurements = new
+                ["prescriptionMapId"] = "<prescriptionMapId>",
+                ["productCode"] = "<productCode>",
+                ["productName"] = "<productName>",
+                ["type"] = "<type>",
+                ["measurements"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        unit = "<unit>",
-                        value = 123.45d,
+                        ["unit"] = "<unit>",
+                        ["value"] = 123.45,
                     },
                 },
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<prescriptionId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<prescriptionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -159,8 +157,8 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("productCode").ToString());
             Console.WriteLine(result.GetProperty("productName").ToString());
             Console.WriteLine(result.GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("eTag").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -171,19 +169,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -193,34 +190,33 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                prescriptionMapId = "<prescriptionMapId>",
-                productCode = "<productCode>",
-                productName = "<productName>",
-                type = "<type>",
-                measurements = new
+                ["prescriptionMapId"] = "<prescriptionMapId>",
+                ["productCode"] = "<productCode>",
+                ["productName"] = "<productName>",
+                ["type"] = "<type>",
+                ["measurements"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        unit = "<unit>",
-                        value = 123.45d,
+                        ["unit"] = "<unit>",
+                        ["value"] = 123.45,
                     },
                 },
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<prescriptionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -228,8 +224,8 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("productCode").ToString());
             Console.WriteLine(result.GetProperty("productName").ToString());
             Console.WriteLine(result.GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("eTag").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -240,15 +236,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<prescriptionId>");
             Console.WriteLine(response.Status);
@@ -258,8 +254,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<prescriptionId>");
             Console.WriteLine(response.Status);
@@ -269,8 +265,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<prescriptionId>");
             Console.WriteLine(response.Status);
@@ -280,8 +276,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<prescriptionId>");
             Console.WriteLine(response.Status);
@@ -291,10 +287,10 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -306,10 +302,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -330,10 +326,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -345,10 +341,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -369,13 +365,13 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPrescriptionsByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetPrescriptionsByPartyId("<partyId>", new string[] { "<prescriptionMapIds>" }, new string[] { "<types>" }, new string[] { "<productCodes>" }, new string[] { "<productNames>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetPrescriptionsByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -383,30 +379,57 @@ public void Example_GetPrescriptionsByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPrescriptionsByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetPrescriptionsByPartyId("<partyId>", new string[] { "<prescriptionMapIds>" }, new string[] { "<types>" }, new string[] { "<productCodes>" }, new string[] { "<productNames>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetPrescriptionsByPartyId("<partyId>", new List<string>()
+{
+"<prescriptionMapIds>"
+}, new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<productCodes>"
+}, new List<string>()
+{
+"<productNames>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("prescriptionMapId").ToString());
-                Console.WriteLine(result.GetProperty("productCode").ToString());
-                Console.WriteLine(result.GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("prescriptionMapId").ToString());
+                Console.WriteLine(result[0].GetProperty("productCode").ToString());
+                Console.WriteLine(result[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -414,13 +437,13 @@ public void Example_GetPrescriptionsByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPrescriptionsByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetPrescriptionsByPartyIdAsync("<partyId>", new string[] { "<prescriptionMapIds>" }, new string[] { "<types>" }, new string[] { "<productCodes>" }, new string[] { "<productNames>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPrescriptionsByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -428,30 +451,57 @@ public async Task Example_GetPrescriptionsByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPrescriptionsByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetPrescriptionsByPartyIdAsync("<partyId>", new string[] { "<prescriptionMapIds>" }, new string[] { "<types>" }, new string[] { "<productCodes>" }, new string[] { "<productNames>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPrescriptionsByPartyIdAsync("<partyId>", new List<string>()
+{
+"<prescriptionMapIds>"
+}, new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<productCodes>"
+}, new List<string>()
+{
+"<productNames>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("prescriptionMapId").ToString());
-                Console.WriteLine(result.GetProperty("productCode").ToString());
-                Console.WriteLine(result.GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("prescriptionMapId").ToString());
+                Console.WriteLine(result[0].GetProperty("productCode").ToString());
+                Console.WriteLine(result[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -459,13 +509,13 @@ public async Task Example_GetPrescriptionsByPartyId_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPrescriptions()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetPrescriptions(new string[] { "<prescriptionMapIds>" }, new string[] { "<types>" }, new string[] { "<productCodes>" }, new string[] { "<productNames>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetPrescriptions(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -473,30 +523,57 @@ public void Example_GetPrescriptions()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPrescriptions_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetPrescriptions(new string[] { "<prescriptionMapIds>" }, new string[] { "<types>" }, new string[] { "<productCodes>" }, new string[] { "<productNames>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetPrescriptions(new List<string>()
+{
+"<prescriptionMapIds>"
+}, new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<productCodes>"
+}, new List<string>()
+{
+"<productNames>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("prescriptionMapId").ToString());
-                Console.WriteLine(result.GetProperty("productCode").ToString());
-                Console.WriteLine(result.GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("prescriptionMapId").ToString());
+                Console.WriteLine(result[0].GetProperty("productCode").ToString());
+                Console.WriteLine(result[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -504,13 +581,13 @@ public void Example_GetPrescriptions_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPrescriptions_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetPrescriptionsAsync(new string[] { "<prescriptionMapIds>" }, new string[] { "<types>" }, new string[] { "<productCodes>" }, new string[] { "<productNames>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPrescriptionsAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -518,30 +595,57 @@ public async Task Example_GetPrescriptions_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPrescriptions_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetPrescriptionsAsync(new string[] { "<prescriptionMapIds>" }, new string[] { "<types>" }, new string[] { "<productCodes>" }, new string[] { "<productNames>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPrescriptionsAsync(new List<string>()
+{
+"<prescriptionMapIds>"
+}, new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<productCodes>"
+}, new List<string>()
+{
+"<productNames>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("prescriptionMapId").ToString());
-                Console.WriteLine(result.GetProperty("productCode").ToString());
-                Console.WriteLine(result.GetProperty("productName").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("measurements").GetProperty("<test>").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("prescriptionMapId").ToString());
+                Console.WriteLine(result[0].GetProperty("productCode").ToString());
+                Console.WriteLine(result[0].GetProperty("productName").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("measurements").GetProperty("<key>").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -549,12 +653,12 @@ public async Task Example_GetPrescriptions_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -565,12 +669,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -590,12 +694,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -606,12 +710,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetPrescriptionsClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Prescriptions client = new FarmBeatsClient(credential).GetPrescriptionsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<prescriptionId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Scenes.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Scenes.cs
index d60abcbfcffb..282d52b3242d 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Scenes.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Scenes.cs
@@ -13,6 +13,7 @@
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,13 +24,13 @@ internal class Samples_Scenes
         [Ignore("Only validating compilation of examples")]
         public void Example_Download()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.Download("<filePath>", new RequestContext());
+            Response response = client.Download("<filePath>", null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -40,13 +41,13 @@ public void Example_Download()
         [Ignore("Only validating compilation of examples")]
         public void Example_Download_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.Download("<filePath>", new RequestContext());
+            Response response = client.Download("<filePath>", null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -57,13 +58,13 @@ public void Example_Download_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Download_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.DownloadAsync("<filePath>", new RequestContext());
+            Response response = await client.DownloadAsync("<filePath>", null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -74,13 +75,13 @@ public async Task Example_Download_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Download_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.DownloadAsync("<filePath>", new RequestContext());
+            Response response = await client.DownloadAsync("<filePath>", null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -91,10 +92,10 @@ public async Task Example_Download_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSatelliteDataIngestionJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSatelliteDataIngestionJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetSatelliteDataIngestionJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -108,10 +109,10 @@ public void Example_GetSatelliteDataIngestionJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSatelliteDataIngestionJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSatelliteDataIngestionJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetSatelliteDataIngestionJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -136,17 +137,17 @@ public void Example_GetSatelliteDataIngestionJobDetails_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSatelliteDataIngestionJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSatelliteDataIngestionJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetSatelliteDataIngestionJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -160,10 +161,10 @@ public async Task Example_GetSatelliteDataIngestionJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSatelliteDataIngestionJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSatelliteDataIngestionJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetSatelliteDataIngestionJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -188,23 +189,22 @@ public async Task Example_GetSatelliteDataIngestionJobDetails_AllParameters_Asyn
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_SearchFeatures()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                endDateTime = "2022-05-10T18:57:31.2311892Z",
-            };
-
-            Response response = client.SearchFeatures("<collectionId>", RequestContent.Create(data));
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+            });
+            Response response = client.SearchFeatures("Sentinel_2_L2A", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("stacVersion").ToString());
@@ -213,42 +213,47 @@ public void Example_SearchFeatures()
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("properties").ToString());
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("href").ToString());
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("rel").ToString());
-            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("href").ToString());
+            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_SearchFeatures_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                endDateTime = "2022-05-10T18:57:31.2311892Z",
-                intersects = new
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["intersects"] = new Dictionary<string, object>()
                 {
-                    coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-                    type = "MultiPolygon",
+                    ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+                    ["type"] = "MultiPolygon",
                 },
-                bbox = new[] {
-        123.45d
-    },
-                featureIds = new[] {
-        "<String>"
-    },
-            };
-
-            Response response = client.SearchFeatures("<collectionId>", RequestContent.Create(data), 1234, 1234);
+                ["bbox"] = new List<object>()
+{
+123.45
+},
+                ["featureIds"] = new List<object>()
+{
+"<featureIds>"
+},
+            });
+            Response response = client.SearchFeatures("Sentinel_2_L2A", content, maxpagesize: 1234, skip: 1234);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("stacVersion").ToString());
@@ -262,11 +267,11 @@ public void Example_SearchFeatures_AllParameters()
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("rel").ToString());
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("title").ToString());
-            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("href").ToString());
-            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("title").ToString());
-            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("roles")[0].ToString());
+            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
+            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("title").ToString());
+            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("roles")[0].ToString());
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("collection").ToString());
             Console.WriteLine(result.GetProperty("nextLink").ToString());
         }
@@ -275,16 +280,15 @@ public void Example_SearchFeatures_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SearchFeatures_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                endDateTime = "2022-05-10T18:57:31.2311892Z",
-            };
-
-            Response response = await client.SearchFeaturesAsync("<collectionId>", RequestContent.Create(data));
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+            });
+            Response response = await client.SearchFeaturesAsync("Sentinel_2_L2A", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("stacVersion").ToString());
@@ -293,42 +297,47 @@ public async Task Example_SearchFeatures_Async()
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("properties").ToString());
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("href").ToString());
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("rel").ToString());
-            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("href").ToString());
+            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SearchFeatures_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                endDateTime = "2022-05-10T18:57:31.2311892Z",
-                intersects = new
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["intersects"] = new Dictionary<string, object>()
                 {
-                    coordinates = new[] {
-            new[] {
-                new[] {
-                    new[] {
-                        123.45d
-                    }
-                }
-            }
-        },
-                    type = "MultiPolygon",
+                    ["coordinates"] = new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+new List<object>()
+{
+123.45
+}
+}
+}
+},
+                    ["type"] = "MultiPolygon",
                 },
-                bbox = new[] {
-        123.45d
-    },
-                featureIds = new[] {
-        "<String>"
-    },
-            };
-
-            Response response = await client.SearchFeaturesAsync("<collectionId>", RequestContent.Create(data), 1234, 1234);
+                ["bbox"] = new List<object>()
+{
+123.45
+},
+                ["featureIds"] = new List<object>()
+{
+"<featureIds>"
+},
+            });
+            Response response = await client.SearchFeaturesAsync("Sentinel_2_L2A", content, maxpagesize: 1234, skip: 1234);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("stacVersion").ToString());
@@ -342,11 +351,11 @@ public async Task Example_SearchFeatures_AllParameters_Async()
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("rel").ToString());
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("links")[0].GetProperty("title").ToString());
-            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("href").ToString());
-            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("title").ToString());
-            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<test>").GetProperty("roles")[0].ToString());
+            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
+            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("title").ToString());
+            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("features")[0].GetProperty("assets").GetProperty("<key>").GetProperty("roles")[0].ToString());
             Console.WriteLine(result.GetProperty("features")[0].GetProperty("collection").ToString());
             Console.WriteLine(result.GetProperty("nextLink").ToString());
         }
@@ -355,10 +364,10 @@ public async Task Example_SearchFeatures_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetStacFeature()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetStacFeature("<collectionId>", "<featureId>", new RequestContext());
+            Response response = client.GetStacFeature("Sentinel_2_L2A", "<featureId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("stacVersion").ToString());
@@ -367,17 +376,17 @@ public void Example_GetStacFeature()
             Console.WriteLine(result.GetProperty("properties").ToString());
             Console.WriteLine(result.GetProperty("links")[0].GetProperty("href").ToString());
             Console.WriteLine(result.GetProperty("links")[0].GetProperty("rel").ToString());
-            Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("href").ToString());
+            Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetStacFeature_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetStacFeature("<collectionId>", "<featureId>", new RequestContext());
+            Response response = client.GetStacFeature("Sentinel_2_L2A", "<featureId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("stacVersion").ToString());
@@ -391,11 +400,11 @@ public void Example_GetStacFeature_AllParameters()
             Console.WriteLine(result.GetProperty("links")[0].GetProperty("rel").ToString());
             Console.WriteLine(result.GetProperty("links")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("links")[0].GetProperty("title").ToString());
-            Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("href").ToString());
-            Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("title").ToString());
-            Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("roles")[0].ToString());
+            Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
+            Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("title").ToString());
+            Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("roles")[0].ToString());
             Console.WriteLine(result.GetProperty("collection").ToString());
         }
 
@@ -403,10 +412,10 @@ public void Example_GetStacFeature_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetStacFeature_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetStacFeatureAsync("<collectionId>", "<featureId>", new RequestContext());
+            Response response = await client.GetStacFeatureAsync("Sentinel_2_L2A", "<featureId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("stacVersion").ToString());
@@ -415,17 +424,17 @@ public async Task Example_GetStacFeature_Async()
             Console.WriteLine(result.GetProperty("properties").ToString());
             Console.WriteLine(result.GetProperty("links")[0].GetProperty("href").ToString());
             Console.WriteLine(result.GetProperty("links")[0].GetProperty("rel").ToString());
-            Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("href").ToString());
+            Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetStacFeature_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetStacFeatureAsync("<collectionId>", "<featureId>", new RequestContext());
+            Response response = await client.GetStacFeatureAsync("Sentinel_2_L2A", "<featureId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("stacVersion").ToString());
@@ -439,11 +448,11 @@ public async Task Example_GetStacFeature_AllParameters_Async()
             Console.WriteLine(result.GetProperty("links")[0].GetProperty("rel").ToString());
             Console.WriteLine(result.GetProperty("links")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("links")[0].GetProperty("title").ToString());
-            Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("href").ToString());
-            Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("title").ToString());
-            Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("assets").GetProperty("<test>").GetProperty("roles")[0].ToString());
+            Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("href").ToString());
+            Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("title").ToString());
+            Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("assets").GetProperty("<key>").GetProperty("roles")[0].ToString());
             Console.WriteLine(result.GetProperty("collection").ToString());
         }
 
@@ -451,13 +460,13 @@ public async Task Example_GetStacFeature_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetScenes()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetScenes("<provider>", "<partyId>", "<boundaryId>", "<source>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<imageNames>" }, new double[] { 3.14 }, new string[] { "<imageFormats>" }, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetScenes("<provider>", "<partyId>", "<boundaryId>", "<source>", null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -465,27 +474,36 @@ public void Example_GetScenes()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetScenes_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetScenes("<provider>", "<partyId>", "<boundaryId>", "<source>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<imageNames>" }, new double[] { 3.14 }, new string[] { "<imageFormats>" }, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetScenes("<provider>", "<partyId>", "<boundaryId>", "<source>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<imageNames>"
+}, new List<double>()
+{
+123.45
+}, new List<string>()
+{
+"<imageFormats>"
+}, 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("sceneDateTime").ToString());
-                Console.WriteLine(result.GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("fileLink").ToString());
-                Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("imageFormat").ToString());
-                Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("resolution").ToString());
-                Console.WriteLine(result.GetProperty("imageFormat").ToString());
-                Console.WriteLine(result.GetProperty("cloudCoverPercentage").ToString());
-                Console.WriteLine(result.GetProperty("darkPixelPercentage").ToString());
-                Console.WriteLine(result.GetProperty("ndviMedianValue").ToString());
-                Console.WriteLine(result.GetProperty("boundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("sceneDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("fileLink").ToString());
+                Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("imageFormat").ToString());
+                Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("resolution").ToString());
+                Console.WriteLine(result[0].GetProperty("imageFormat").ToString());
+                Console.WriteLine(result[0].GetProperty("cloudCoverPercentage").ToString());
+                Console.WriteLine(result[0].GetProperty("darkPixelPercentage").ToString());
+                Console.WriteLine(result[0].GetProperty("ndviMedianValue").ToString());
+                Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
             }
         }
 
@@ -493,13 +511,13 @@ public void Example_GetScenes_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetScenes_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetScenesAsync("<provider>", "<partyId>", "<boundaryId>", "<source>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<imageNames>" }, new double[] { 3.14 }, new string[] { "<imageFormats>" }, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetScenesAsync("<provider>", "<partyId>", "<boundaryId>", "<source>", null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -507,27 +525,36 @@ public async Task Example_GetScenes_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetScenes_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetScenesAsync("<provider>", "<partyId>", "<boundaryId>", "<source>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<imageNames>" }, new double[] { 3.14 }, new string[] { "<imageFormats>" }, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetScenesAsync("<provider>", "<partyId>", "<boundaryId>", "<source>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<imageNames>"
+}, new List<double>()
+{
+123.45
+}, new List<string>()
+{
+"<imageFormats>"
+}, 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("sceneDateTime").ToString());
-                Console.WriteLine(result.GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("fileLink").ToString());
-                Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("imageFormat").ToString());
-                Console.WriteLine(result.GetProperty("imageFiles")[0].GetProperty("resolution").ToString());
-                Console.WriteLine(result.GetProperty("imageFormat").ToString());
-                Console.WriteLine(result.GetProperty("cloudCoverPercentage").ToString());
-                Console.WriteLine(result.GetProperty("darkPixelPercentage").ToString());
-                Console.WriteLine(result.GetProperty("ndviMedianValue").ToString());
-                Console.WriteLine(result.GetProperty("boundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("sceneDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("fileLink").ToString());
+                Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("imageFormat").ToString());
+                Console.WriteLine(result[0].GetProperty("imageFiles")[0].GetProperty("resolution").ToString());
+                Console.WriteLine(result[0].GetProperty("imageFormat").ToString());
+                Console.WriteLine(result[0].GetProperty("cloudCoverPercentage").ToString());
+                Console.WriteLine(result[0].GetProperty("darkPixelPercentage").ToString());
+                Console.WriteLine(result[0].GetProperty("ndviMedianValue").ToString());
+                Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
             }
         }
 
@@ -535,21 +562,20 @@ public async Task Example_GetScenes_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateSatelliteDataIngestionJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                endDateTime = "2022-05-10T18:57:31.2311892Z",
-                source = "Sentinel_2_L2A",
-            };
-
-            var operation = client.CreateSatelliteDataIngestionJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["source"] = "Sentinel_2_L2A",
+            });
+            Operation<BinaryData> operation = client.CreateSatelliteDataIngestionJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -562,40 +588,42 @@ public void Example_CreateSatelliteDataIngestionJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateSatelliteDataIngestionJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                endDateTime = "2022-05-10T18:57:31.2311892Z",
-                provider = "Microsoft",
-                source = "Sentinel_2_L2A",
-                data = new
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["provider"] = "Microsoft",
+                ["source"] = "Sentinel_2_L2A",
+                ["data"] = new Dictionary<string, object>()
                 {
-                    imageNames = new[] {
-            "<String>"
-        },
-                    imageFormats = new[] {
-            "<String>"
-        },
-                    imageResolutions = new[] {
-            123.45d
-        },
+                    ["imageNames"] = new List<object>()
+{
+"<imageNames>"
+},
+                    ["imageFormats"] = new List<object>()
+{
+"<imageFormats>"
+},
+                    ["imageResolutions"] = new List<object>()
+{
+123.45
+},
                 },
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = client.CreateSatelliteDataIngestionJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.CreateSatelliteDataIngestionJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -619,28 +647,27 @@ public void Example_CreateSatelliteDataIngestionJob_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateSatelliteDataIngestionJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                endDateTime = "2022-05-10T18:57:31.2311892Z",
-                source = "Sentinel_2_L2A",
-            };
-
-            var operation = await client.CreateSatelliteDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["source"] = "Sentinel_2_L2A",
+            });
+            Operation<BinaryData> operation = await client.CreateSatelliteDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -653,40 +680,42 @@ public async Task Example_CreateSatelliteDataIngestionJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateSatelliteDataIngestionJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetScenesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Scenes client = new FarmBeatsClient(credential).GetScenesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                endDateTime = "2022-05-10T18:57:31.2311892Z",
-                provider = "Microsoft",
-                source = "Sentinel_2_L2A",
-                data = new
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["provider"] = "Microsoft",
+                ["source"] = "Sentinel_2_L2A",
+                ["data"] = new Dictionary<string, object>()
                 {
-                    imageNames = new[] {
-            "<String>"
-        },
-                    imageFormats = new[] {
-            "<String>"
-        },
-                    imageResolutions = new[] {
-            123.45d
-        },
+                    ["imageNames"] = new List<object>()
+{
+"<imageNames>"
+},
+                    ["imageFormats"] = new List<object>()
+{
+"<imageFormats>"
+},
+                    ["imageResolutions"] = new List<object>()
+{
+123.45
+},
                 },
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = await client.CreateSatelliteDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.CreateSatelliteDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
@@ -710,7 +739,7 @@ public async Task Example_CreateSatelliteDataIngestionJob_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
     }
 }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SeasonalFields.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SeasonalFields.cs
index 74cce23899af..07c4eec39873 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SeasonalFields.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SeasonalFields.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_SeasonalFields
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSeasonalField()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSeasonalField("<partyId>", "<seasonalFieldId>", new RequestContext());
+            Response response = client.GetSeasonalField("<partyId>", "<seasonalFieldId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,10 +36,10 @@ public void Example_GetSeasonalField()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSeasonalField_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSeasonalField("<partyId>", "<seasonalFieldId>", new RequestContext());
+            Response response = client.GetSeasonalField("<partyId>", "<seasonalFieldId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -58,17 +58,17 @@ public void Example_GetSeasonalField_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSeasonalField_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSeasonalFieldAsync("<partyId>", "<seasonalFieldId>", new RequestContext());
+            Response response = await client.GetSeasonalFieldAsync("<partyId>", "<seasonalFieldId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -78,10 +78,10 @@ public async Task Example_GetSeasonalField_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSeasonalField_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSeasonalFieldAsync("<partyId>", "<seasonalFieldId>", new RequestContext());
+            Response response = await client.GetSeasonalFieldAsync("<partyId>", "<seasonalFieldId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -100,19 +100,18 @@ public async Task Example_GetSeasonalField_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<seasonalFieldId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<seasonalFieldId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -122,29 +121,29 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                farmId = "<farmId>",
-                fieldId = "<fieldId>",
-                seasonId = "<seasonId>",
-                cropProductIds = new[] {
-        "<String>"
-    },
-                cropId = "<cropId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["farmId"] = "<farmId>",
+                ["fieldId"] = "<fieldId>",
+                ["seasonId"] = "<seasonId>",
+                ["cropProductIds"] = new List<object>()
+{
+"<cropProductIds>"
+},
+                ["cropId"] = "<cropId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<seasonalFieldId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<seasonalFieldId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -163,19 +162,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<seasonalFieldId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<seasonalFieldId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -185,29 +183,29 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                farmId = "<farmId>",
-                fieldId = "<fieldId>",
-                seasonId = "<seasonId>",
-                cropProductIds = new[] {
-        "<String>"
-    },
-                cropId = "<cropId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["farmId"] = "<farmId>",
+                ["fieldId"] = "<fieldId>",
+                ["seasonId"] = "<seasonId>",
+                ["cropProductIds"] = new List<object>()
+{
+"<cropProductIds>"
+},
+                ["cropId"] = "<cropId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<seasonalFieldId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<seasonalFieldId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -226,15 +224,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<seasonalFieldId>");
             Console.WriteLine(response.Status);
@@ -244,8 +242,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<seasonalFieldId>");
             Console.WriteLine(response.Status);
@@ -255,8 +253,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<seasonalFieldId>");
             Console.WriteLine(response.Status);
@@ -266,8 +264,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<seasonalFieldId>");
             Console.WriteLine(response.Status);
@@ -277,10 +275,10 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -292,10 +290,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -316,10 +314,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -331,10 +329,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -355,13 +353,13 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSeasonalFieldsByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetSeasonalFieldsByPartyId("<partyId>", new string[] { "<farmIds>" }, new string[] { "<fieldIds>" }, new string[] { "<seasonIds>" }, new string[] { "<cropProductIds>" }, new string[] { "<cropIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetSeasonalFieldsByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -369,29 +367,56 @@ public void Example_GetSeasonalFieldsByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSeasonalFieldsByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetSeasonalFieldsByPartyId("<partyId>", new string[] { "<farmIds>" }, new string[] { "<fieldIds>" }, new string[] { "<seasonIds>" }, new string[] { "<cropProductIds>" }, new string[] { "<cropIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetSeasonalFieldsByPartyId("<partyId>", new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropProductIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("farmId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("cropProductIds")[0].ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("farmId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropProductIds")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -399,13 +424,13 @@ public void Example_GetSeasonalFieldsByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSeasonalFieldsByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetSeasonalFieldsByPartyIdAsync("<partyId>", new string[] { "<farmIds>" }, new string[] { "<fieldIds>" }, new string[] { "<seasonIds>" }, new string[] { "<cropProductIds>" }, new string[] { "<cropIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSeasonalFieldsByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -413,29 +438,56 @@ public async Task Example_GetSeasonalFieldsByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSeasonalFieldsByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetSeasonalFieldsByPartyIdAsync("<partyId>", new string[] { "<farmIds>" }, new string[] { "<fieldIds>" }, new string[] { "<seasonIds>" }, new string[] { "<cropProductIds>" }, new string[] { "<cropIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSeasonalFieldsByPartyIdAsync("<partyId>", new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropProductIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("farmId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("cropProductIds")[0].ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("farmId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropProductIds")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -443,13 +495,13 @@ public async Task Example_GetSeasonalFieldsByPartyId_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSeasonalFields()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetSeasonalFields(new string[] { "<farmIds>" }, new string[] { "<fieldIds>" }, new string[] { "<seasonIds>" }, new string[] { "<cropProductIds>" }, new string[] { "<cropIds>" }, new string[] { "<seasonalFieldIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetSeasonalFields(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -457,29 +509,56 @@ public void Example_GetSeasonalFields()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSeasonalFields_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetSeasonalFields(new string[] { "<farmIds>" }, new string[] { "<fieldIds>" }, new string[] { "<seasonIds>" }, new string[] { "<cropProductIds>" }, new string[] { "<cropIds>" }, new string[] { "<seasonalFieldIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetSeasonalFields(new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropProductIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonalFieldIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("farmId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("cropProductIds")[0].ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("farmId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropProductIds")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -487,13 +566,13 @@ public void Example_GetSeasonalFields_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSeasonalFields_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetSeasonalFieldsAsync(new string[] { "<farmIds>" }, new string[] { "<fieldIds>" }, new string[] { "<seasonIds>" }, new string[] { "<cropProductIds>" }, new string[] { "<cropIds>" }, new string[] { "<seasonalFieldIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSeasonalFieldsAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -501,29 +580,56 @@ public async Task Example_GetSeasonalFields_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSeasonalFields_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetSeasonalFieldsAsync(new string[] { "<farmIds>" }, new string[] { "<fieldIds>" }, new string[] { "<seasonIds>" }, new string[] { "<cropProductIds>" }, new string[] { "<cropIds>" }, new string[] { "<seasonalFieldIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSeasonalFieldsAsync(new List<string>()
+{
+"<farmIds>"
+}, new List<string>()
+{
+"<fieldIds>"
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<cropProductIds>"
+}, new List<string>()
+{
+"<cropIds>"
+}, new List<string>()
+{
+"<seasonalFieldIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("farmId").ToString());
-                Console.WriteLine(result.GetProperty("fieldId").ToString());
-                Console.WriteLine(result.GetProperty("seasonId").ToString());
-                Console.WriteLine(result.GetProperty("cropProductIds")[0].ToString());
-                Console.WriteLine(result.GetProperty("cropId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("farmId").ToString());
+                Console.WriteLine(result[0].GetProperty("fieldId").ToString());
+                Console.WriteLine(result[0].GetProperty("seasonId").ToString());
+                Console.WriteLine(result[0].GetProperty("cropProductIds")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("cropId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -531,12 +637,12 @@ public async Task Example_GetSeasonalFields_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<seasonalFieldId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<seasonalFieldId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -547,12 +653,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<seasonalFieldId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<seasonalFieldId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -572,12 +678,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<seasonalFieldId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<seasonalFieldId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -588,12 +694,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonalFieldsClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<seasonalFieldId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            SeasonalFields client = new FarmBeatsClient(credential).GetSeasonalFieldsClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<seasonalFieldId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Seasons.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Seasons.cs
index 6ee474ed4e7d..0d394b349414 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Seasons.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Seasons.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_Seasons
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSeason()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSeason("<seasonId>", new RequestContext());
+            Response response = client.GetSeason("<seasonId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,10 +36,10 @@ public void Example_GetSeason()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSeason_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSeason("<seasonId>", new RequestContext());
+            Response response = client.GetSeason("<seasonId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("startDateTime").ToString());
@@ -56,17 +56,17 @@ public void Example_GetSeason_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSeason_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSeasonAsync("<seasonId>", new RequestContext());
+            Response response = await client.GetSeasonAsync("<seasonId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -76,10 +76,10 @@ public async Task Example_GetSeason_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSeason_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSeasonAsync("<seasonId>", new RequestContext());
+            Response response = await client.GetSeasonAsync("<seasonId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("startDateTime").ToString());
@@ -96,19 +96,18 @@ public async Task Example_GetSeason_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<seasonId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<seasonId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -118,26 +117,25 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                endDateTime = "2022-05-10T18:57:31.2311892Z",
-                year = 1234,
-                geographicIdentifier = "<geographicIdentifier>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["year"] = 1234,
+                ["geographicIdentifier"] = "<geographicIdentifier>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<seasonId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<seasonId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("startDateTime").ToString());
@@ -154,19 +152,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateAsync("<seasonId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<seasonId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -176,26 +173,25 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                endDateTime = "2022-05-10T18:57:31.2311892Z",
-                year = 1234,
-                geographicIdentifier = "<geographicIdentifier>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["year"] = 1234,
+                ["geographicIdentifier"] = "<geographicIdentifier>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<seasonId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<seasonId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("startDateTime").ToString());
@@ -212,15 +208,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<seasonId>");
             Console.WriteLine(response.Status);
@@ -230,8 +226,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<seasonId>");
             Console.WriteLine(response.Status);
@@ -241,8 +237,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<seasonId>");
             Console.WriteLine(response.Status);
@@ -252,8 +248,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<seasonId>");
             Console.WriteLine(response.Status);
@@ -263,13 +259,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSeasons()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetSeasons(DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, new int[] { 1234 }, new string[] { "<seasonIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetSeasons(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -277,27 +273,42 @@ public void Example_GetSeasons()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSeasons_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetSeasons(DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, new int[] { 1234 }, new string[] { "<seasonIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetSeasons(DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), new List<int>()
+{
+1234
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("startDateTime").ToString());
-                Console.WriteLine(result.GetProperty("endDateTime").ToString());
-                Console.WriteLine(result.GetProperty("year").ToString());
-                Console.WriteLine(result.GetProperty("geographicIdentifier").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("endDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("year").ToString());
+                Console.WriteLine(result[0].GetProperty("geographicIdentifier").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -305,13 +316,13 @@ public void Example_GetSeasons_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSeasons_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetSeasonsAsync(DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, new int[] { 1234 }, new string[] { "<seasonIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSeasonsAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -319,27 +330,42 @@ public async Task Example_GetSeasons_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSeasons_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSeasonsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Seasons client = new FarmBeatsClient(credential).GetSeasonsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetSeasonsAsync(DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, new int[] { 1234 }, new string[] { "<seasonIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSeasonsAsync(DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), new List<int>()
+{
+1234
+}, new List<string>()
+{
+"<seasonIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("startDateTime").ToString());
-                Console.WriteLine(result.GetProperty("endDateTime").ToString());
-                Console.WriteLine(result.GetProperty("year").ToString());
-                Console.WriteLine(result.GetProperty("geographicIdentifier").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("endDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("year").ToString());
+                Console.WriteLine(result[0].GetProperty("geographicIdentifier").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
     }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorDataModels.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorDataModels.cs
index 137a6e45269e..76f3b2ab8fc5 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorDataModels.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorDataModels.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,72 +23,70 @@ internal class Samples_SensorDataModels
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                measures = new
+                ["measures"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        dataType = "Bool",
+                        ["dataType"] = "Bool",
                     },
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorDataModelId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorDataModelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                type = "<type>",
-                manufacturer = "<manufacturer>",
-                productCode = "<productCode>",
-                measures = new
+                ["type"] = "<type>",
+                ["manufacturer"] = "<manufacturer>",
+                ["productCode"] = "<productCode>",
+                ["measures"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        description = "<description>",
-                        dataType = "Bool",
-                        type = "<type>",
-                        unit = "<unit>",
-                        properties = new
+                        ["description"] = "<description>",
+                        ["dataType"] = "Bool",
+                        ["type"] = "<type>",
+                        ["unit"] = "<unit>",
+                        ["properties"] = new Dictionary<string, object>()
                         {
-                            key = new { },
+                            ["key"] = new Dictionary<string, object>(),
                         },
                     },
                 },
-                status = "<status>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorDataModelId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorDataModelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("manufacturer").ToString());
             Console.WriteLine(result.GetProperty("productCode").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("properties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -99,79 +97,77 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                measures = new
+                ["measures"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        dataType = "Bool",
+                        ["dataType"] = "Bool",
                     },
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorDataModelId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorDataModelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                type = "<type>",
-                manufacturer = "<manufacturer>",
-                productCode = "<productCode>",
-                measures = new
+                ["type"] = "<type>",
+                ["manufacturer"] = "<manufacturer>",
+                ["productCode"] = "<productCode>",
+                ["measures"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        description = "<description>",
-                        dataType = "Bool",
-                        type = "<type>",
-                        unit = "<unit>",
-                        properties = new
+                        ["description"] = "<description>",
+                        ["dataType"] = "Bool",
+                        ["type"] = "<type>",
+                        ["unit"] = "<unit>",
+                        ["properties"] = new Dictionary<string, object>()
                         {
-                            key = new { },
+                            ["key"] = new Dictionary<string, object>(),
                         },
                     },
                 },
-                status = "<status>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["status"] = "<status>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorDataModelId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorDataModelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("manufacturer").ToString());
             Console.WriteLine(result.GetProperty("productCode").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("properties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -182,40 +178,40 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorDataModel()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSensorDataModel("<sensorPartnerId>", "<sensorDataModelId>", new RequestContext());
+            Response response = client.GetSensorDataModel("<sensorPartnerId>", "<sensorDataModelId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorDataModel_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSensorDataModel("<sensorPartnerId>", "<sensorDataModelId>", new RequestContext());
+            Response response = client.GetSensorDataModel("<sensorPartnerId>", "<sensorDataModelId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("manufacturer").ToString());
             Console.WriteLine(result.GetProperty("productCode").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("properties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -226,40 +222,40 @@ public void Example_GetSensorDataModel_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorDataModel_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSensorDataModelAsync("<sensorPartnerId>", "<sensorDataModelId>", new RequestContext());
+            Response response = await client.GetSensorDataModelAsync("<sensorPartnerId>", "<sensorDataModelId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorDataModel_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSensorDataModelAsync("<sensorPartnerId>", "<sensorDataModelId>", new RequestContext());
+            Response response = await client.GetSensorDataModelAsync("<sensorPartnerId>", "<sensorDataModelId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("manufacturer").ToString());
             Console.WriteLine(result.GetProperty("productCode").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("measures").GetProperty("<key>").GetProperty("properties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -270,15 +266,15 @@ public async Task Example_GetSensorDataModel_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<sensorPartnerId>", "<sensorDataModelId>");
             Console.WriteLine(response.Status);
@@ -288,8 +284,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<sensorPartnerId>", "<sensorDataModelId>");
             Console.WriteLine(response.Status);
@@ -299,8 +295,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<sensorPartnerId>", "<sensorDataModelId>");
             Console.WriteLine(response.Status);
@@ -310,8 +306,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<sensorPartnerId>", "<sensorDataModelId>");
             Console.WriteLine(response.Status);
@@ -321,13 +317,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorDataModels()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetSensorDataModels("<sensorPartnerId>", new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetSensorDataModels("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
+                Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
             }
         }
 
@@ -335,31 +331,43 @@ public void Example_GetSensorDataModels()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorDataModels_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetSensorDataModels("<sensorPartnerId>", new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetSensorDataModels("<sensorPartnerId>", new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("manufacturer").ToString());
-                Console.WriteLine(result.GetProperty("productCode").ToString());
-                Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
-                Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("properties").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("manufacturer").ToString());
+                Console.WriteLine(result[0].GetProperty("productCode").ToString());
+                Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
+                Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("properties").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -367,13 +375,13 @@ public void Example_GetSensorDataModels_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorDataModels_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetSensorDataModelsAsync("<sensorPartnerId>", new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSensorDataModelsAsync("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
+                Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
             }
         }
 
@@ -381,31 +389,43 @@ public async Task Example_GetSensorDataModels_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorDataModels_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorDataModelsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorDataModels client = new FarmBeatsClient(credential).GetSensorDataModelsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetSensorDataModelsAsync("<sensorPartnerId>", new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSensorDataModelsAsync("<sensorPartnerId>", new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("manufacturer").ToString());
-                Console.WriteLine(result.GetProperty("productCode").ToString());
-                Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("dataType").ToString());
-                Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("measures").GetProperty("<test>").GetProperty("properties").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("manufacturer").ToString());
+                Console.WriteLine(result[0].GetProperty("productCode").ToString());
+                Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("dataType").ToString());
+                Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("measures").GetProperty("<key>").GetProperty("properties").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
     }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorEvents.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorEvents.cs
index a2f51888393c..f7f1550f1dd0 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorEvents.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorEvents.cs
@@ -6,13 +6,12 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +22,10 @@ internal class Samples_SensorEvents
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorEvents()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorEventsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorEvents client = new FarmBeatsClient(credential).GetSensorEventsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSensorEvents("<sensorId>", "<sensorPartnerId>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, true, new RequestContext());
+            Response response = client.GetSensorEvents("<sensorId>", "<sensorPartnerId>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("value")[0].ToString());
@@ -36,10 +35,10 @@ public void Example_GetSensorEvents()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorEvents_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorEventsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorEvents client = new FarmBeatsClient(credential).GetSensorEventsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSensorEvents("<sensorId>", "<sensorPartnerId>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, true, new RequestContext());
+            Response response = client.GetSensorEvents("<sensorId>", "<sensorPartnerId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("value")[0].GetProperty("sensorId").ToString());
@@ -48,7 +47,7 @@ public void Example_GetSensorEvents_AllParameters()
             Console.WriteLine(result.GetProperty("value")[0].GetProperty("boundaryId").ToString());
             Console.WriteLine(result.GetProperty("value")[0].GetProperty("eventDateTime").ToString());
             Console.WriteLine(result.GetProperty("value")[0].GetProperty("ingestionDateTime").ToString());
-            Console.WriteLine(result.GetProperty("value")[0].GetProperty("measures").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("value")[0].GetProperty("measures").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("skipToken").ToString());
             Console.WriteLine(result.GetProperty("nextLink").ToString());
         }
@@ -57,10 +56,10 @@ public void Example_GetSensorEvents_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorEvents_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorEventsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorEvents client = new FarmBeatsClient(credential).GetSensorEventsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSensorEventsAsync("<sensorId>", "<sensorPartnerId>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, true, new RequestContext());
+            Response response = await client.GetSensorEventsAsync("<sensorId>", "<sensorPartnerId>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("value")[0].ToString());
@@ -70,10 +69,10 @@ public async Task Example_GetSensorEvents_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorEvents_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorEventsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorEvents client = new FarmBeatsClient(credential).GetSensorEventsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSensorEventsAsync("<sensorId>", "<sensorPartnerId>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, true, new RequestContext());
+            Response response = await client.GetSensorEventsAsync("<sensorId>", "<sensorPartnerId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("value")[0].GetProperty("sensorId").ToString());
@@ -82,7 +81,7 @@ public async Task Example_GetSensorEvents_AllParameters_Async()
             Console.WriteLine(result.GetProperty("value")[0].GetProperty("boundaryId").ToString());
             Console.WriteLine(result.GetProperty("value")[0].GetProperty("eventDateTime").ToString());
             Console.WriteLine(result.GetProperty("value")[0].GetProperty("ingestionDateTime").ToString());
-            Console.WriteLine(result.GetProperty("value")[0].GetProperty("measures").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("value")[0].GetProperty("measures").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("skipToken").ToString());
             Console.WriteLine(result.GetProperty("nextLink").ToString());
         }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorMappings.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorMappings.cs
index b9db20de848d..232d3692ad78 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorMappings.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorMappings.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,12 +23,11 @@ internal class Samples_SensorMappings
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<sensorMappingId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<sensorMappingId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -38,25 +37,24 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                sensorId = "<sensorId>",
-                sensorPartnerId = "<sensorPartnerId>",
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                status = "<status>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["sensorId"] = "<sensorId>",
+                ["sensorPartnerId"] = "<sensorPartnerId>",
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["status"] = "<status>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<sensorMappingId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<sensorMappingId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("sensorId").ToString());
@@ -72,19 +70,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<sensorMappingId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<sensorMappingId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -94,25 +91,24 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                sensorId = "<sensorId>",
-                sensorPartnerId = "<sensorPartnerId>",
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                status = "<status>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["sensorId"] = "<sensorId>",
+                ["sensorPartnerId"] = "<sensorPartnerId>",
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["status"] = "<status>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<sensorMappingId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<sensorMappingId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("sensorId").ToString());
@@ -128,17 +124,17 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorMapping()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSensorMapping("<sensorMappingId>", new RequestContext());
+            Response response = client.GetSensorMapping("<sensorMappingId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -148,10 +144,10 @@ public void Example_GetSensorMapping()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorMapping_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSensorMapping("<sensorMappingId>", new RequestContext());
+            Response response = client.GetSensorMapping("<sensorMappingId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("sensorId").ToString());
@@ -167,17 +163,17 @@ public void Example_GetSensorMapping_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorMapping_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSensorMappingAsync("<sensorMappingId>", new RequestContext());
+            Response response = await client.GetSensorMappingAsync("<sensorMappingId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -187,10 +183,10 @@ public async Task Example_GetSensorMapping_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorMapping_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSensorMappingAsync("<sensorMappingId>", new RequestContext());
+            Response response = await client.GetSensorMappingAsync("<sensorMappingId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("sensorId").ToString());
@@ -206,15 +202,15 @@ public async Task Example_GetSensorMapping_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<sensorMappingId>");
             Console.WriteLine(response.Status);
@@ -224,8 +220,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<sensorMappingId>");
             Console.WriteLine(response.Status);
@@ -235,8 +231,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<sensorMappingId>");
             Console.WriteLine(response.Status);
@@ -246,8 +242,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<sensorMappingId>");
             Console.WriteLine(response.Status);
@@ -257,13 +253,13 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorMappings()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetSensorMappings(new string[] { "<sensorIds>" }, new string[] { "<sensorPartnerIds>" }, new string[] { "<partyIds>" }, new string[] { "<boundaryIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetSensorMappings(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -271,26 +267,50 @@ public void Example_GetSensorMappings()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorMappings_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetSensorMappings(new string[] { "<sensorIds>" }, new string[] { "<sensorPartnerIds>" }, new string[] { "<partyIds>" }, new string[] { "<boundaryIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetSensorMappings(new List<string>()
+{
+"<sensorIds>"
+}, new List<string>()
+{
+"<sensorPartnerIds>"
+}, new List<string>()
+{
+"<partyIds>"
+}, new List<string>()
+{
+"<boundaryIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("sensorId").ToString());
-                Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("boundaryId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("sensorId").ToString());
+                Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -298,13 +318,13 @@ public void Example_GetSensorMappings_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorMappings_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetSensorMappingsAsync(new string[] { "<sensorIds>" }, new string[] { "<sensorPartnerIds>" }, new string[] { "<partyIds>" }, new string[] { "<boundaryIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSensorMappingsAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -312,26 +332,50 @@ public async Task Example_GetSensorMappings_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorMappings_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorMappingsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorMappings client = new FarmBeatsClient(credential).GetSensorMappingsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetSensorMappingsAsync(new string[] { "<sensorIds>" }, new string[] { "<sensorPartnerIds>" }, new string[] { "<partyIds>" }, new string[] { "<boundaryIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSensorMappingsAsync(new List<string>()
+{
+"<sensorIds>"
+}, new List<string>()
+{
+"<sensorPartnerIds>"
+}, new List<string>()
+{
+"<partyIds>"
+}, new List<string>()
+{
+"<boundaryIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("sensorId").ToString());
-                Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("boundaryId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("sensorId").ToString());
+                Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
     }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorPartnerIntegrations.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorPartnerIntegrations.cs
index 6610ab58ff36..6a08c6d7d111 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorPartnerIntegrations.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SensorPartnerIntegrations.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,12 +23,11 @@ internal class Samples_SensorPartnerIntegrations
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<integrationId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<integrationId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -38,22 +37,21 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                status = "<status>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["partyId"] = "<partyId>",
+                ["status"] = "<status>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<integrationId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<integrationId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("integrationId").ToString());
@@ -68,19 +66,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<integrationId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<integrationId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -90,22 +87,21 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                partyId = "<partyId>",
-                status = "<status>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["partyId"] = "<partyId>",
+                ["status"] = "<status>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<integrationId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<integrationId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("integrationId").ToString());
@@ -120,17 +116,17 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorPartnerIntegration()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSensorPartnerIntegration("<sensorPartnerId>", "<integrationId>", new RequestContext());
+            Response response = client.GetSensorPartnerIntegration("<sensorPartnerId>", "<integrationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -140,10 +136,10 @@ public void Example_GetSensorPartnerIntegration()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorPartnerIntegration_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSensorPartnerIntegration("<sensorPartnerId>", "<integrationId>", new RequestContext());
+            Response response = client.GetSensorPartnerIntegration("<sensorPartnerId>", "<integrationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("integrationId").ToString());
@@ -158,17 +154,17 @@ public void Example_GetSensorPartnerIntegration_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorPartnerIntegration_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSensorPartnerIntegrationAsync("<sensorPartnerId>", "<integrationId>", new RequestContext());
+            Response response = await client.GetSensorPartnerIntegrationAsync("<sensorPartnerId>", "<integrationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -178,10 +174,10 @@ public async Task Example_GetSensorPartnerIntegration_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorPartnerIntegration_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSensorPartnerIntegrationAsync("<sensorPartnerId>", "<integrationId>", new RequestContext());
+            Response response = await client.GetSensorPartnerIntegrationAsync("<sensorPartnerId>", "<integrationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("integrationId").ToString());
@@ -196,15 +192,15 @@ public async Task Example_GetSensorPartnerIntegration_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<sensorPartnerId>", "<integrationId>");
             Console.WriteLine(response.Status);
@@ -214,8 +210,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<sensorPartnerId>", "<integrationId>");
             Console.WriteLine(response.Status);
@@ -225,8 +221,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<sensorPartnerId>", "<integrationId>");
             Console.WriteLine(response.Status);
@@ -236,8 +232,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<sensorPartnerId>", "<integrationId>");
             Console.WriteLine(response.Status);
@@ -247,10 +243,10 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CheckConsent()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.CheckConsent("<sensorPartnerId>", "<integrationId>", "<key>", new RequestContext());
+            Response response = client.CheckConsent("<sensorPartnerId>", "<integrationId>", "<key>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -260,10 +256,10 @@ public void Example_CheckConsent()
         [Ignore("Only validating compilation of examples")]
         public void Example_CheckConsent_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.CheckConsent("<sensorPartnerId>", "<integrationId>", "<key>", new RequestContext());
+            Response response = client.CheckConsent("<sensorPartnerId>", "<integrationId>", "<key>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("consented").ToString());
@@ -275,10 +271,10 @@ public void Example_CheckConsent_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CheckConsent_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CheckConsentAsync("<sensorPartnerId>", "<integrationId>", "<key>", new RequestContext());
+            Response response = await client.CheckConsentAsync("<sensorPartnerId>", "<integrationId>", "<key>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -288,10 +284,10 @@ public async Task Example_CheckConsent_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CheckConsent_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CheckConsentAsync("<sensorPartnerId>", "<integrationId>", "<key>", new RequestContext());
+            Response response = await client.CheckConsentAsync("<sensorPartnerId>", "<integrationId>", "<key>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("consented").ToString());
@@ -303,10 +299,10 @@ public async Task Example_CheckConsent_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GenerateConsentLink()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GenerateConsentLink("<sensorPartnerId>", "<integrationId>", new RequestContext());
+            Response response = client.GenerateConsentLink("<sensorPartnerId>", "<integrationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -316,10 +312,10 @@ public void Example_GenerateConsentLink()
         [Ignore("Only validating compilation of examples")]
         public void Example_GenerateConsentLink_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GenerateConsentLink("<sensorPartnerId>", "<integrationId>", new RequestContext());
+            Response response = client.GenerateConsentLink("<sensorPartnerId>", "<integrationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("consentLink").ToString());
@@ -330,10 +326,10 @@ public void Example_GenerateConsentLink_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GenerateConsentLink_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GenerateConsentLinkAsync("<sensorPartnerId>", "<integrationId>", new RequestContext());
+            Response response = await client.GenerateConsentLinkAsync("<sensorPartnerId>", "<integrationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -343,10 +339,10 @@ public async Task Example_GenerateConsentLink_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GenerateConsentLink_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GenerateConsentLinkAsync("<sensorPartnerId>", "<integrationId>", new RequestContext());
+            Response response = await client.GenerateConsentLinkAsync("<sensorPartnerId>", "<integrationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("consentLink").ToString());
@@ -357,13 +353,13 @@ public async Task Example_GenerateConsentLink_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorPartnerIntegrations()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetSensorPartnerIntegrations("<sensorPartnerId>", new string[] { "<integrationIds>" }, new string[] { "<partyIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetSensorPartnerIntegrations("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -371,25 +367,43 @@ public void Example_GetSensorPartnerIntegrations()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensorPartnerIntegrations_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetSensorPartnerIntegrations("<sensorPartnerId>", new string[] { "<integrationIds>" }, new string[] { "<partyIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetSensorPartnerIntegrations("<sensorPartnerId>", new List<string>()
+{
+"<integrationIds>"
+}, new List<string>()
+{
+"<partyIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("integrationId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("integrationId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -397,13 +411,13 @@ public void Example_GetSensorPartnerIntegrations_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorPartnerIntegrations_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetSensorPartnerIntegrationsAsync("<sensorPartnerId>", new string[] { "<integrationIds>" }, new string[] { "<partyIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSensorPartnerIntegrationsAsync("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -411,25 +425,43 @@ public async Task Example_GetSensorPartnerIntegrations_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensorPartnerIntegrations_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SensorPartnerIntegrations client = new FarmBeatsClient(credential).GetSensorPartnerIntegrationsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetSensorPartnerIntegrationsAsync("<sensorPartnerId>", new string[] { "<integrationIds>" }, new string[] { "<partyIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSensorPartnerIntegrationsAsync("<sensorPartnerId>", new List<string>()
+{
+"<integrationIds>"
+}, new List<string>()
+{
+"<partyIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("integrationId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("integrationId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
     }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Sensors.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Sensors.cs
index f4c8c66630b9..b2309de2315b 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Sensors.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Sensors.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,12 +23,11 @@ internal class Samples_Sensors
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -38,39 +37,39 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                sensorDataModelId = "<sensorDataModelId>",
-                integrationId = "<integrationId>",
-                hardwareId = "<hardwareId>",
-                deviceId = "<deviceId>",
-                type = "<type>",
-                location = new
+                ["sensorDataModelId"] = "<sensorDataModelId>",
+                ["integrationId"] = "<integrationId>",
+                ["hardwareId"] = "<hardwareId>",
+                ["deviceId"] = "<deviceId>",
+                ["type"] = "<type>",
+                ["location"] = new Dictionary<string, object>()
                 {
-                    latitude = 123.45d,
-                    longitude = 123.45d,
+                    ["latitude"] = 123.45,
+                    ["longitude"] = 123.45,
                 },
-                port = new
+                ["port"] = new Dictionary<string, object>()
                 {
-                    name = "<name>",
-                    type = "<type>",
+                    ["name"] = "<name>",
+                    ["type"] = "<type>",
                 },
-                depthInMeters = new[] {
-        123.45d
-    },
-                status = "<status>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["depthInMeters"] = new List<object>()
+{
+123.45
+},
+                ["status"] = "<status>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<sensorPartnerId>", "<sensorId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("sensorDataModelId").ToString());
@@ -93,19 +92,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -115,39 +113,39 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                sensorDataModelId = "<sensorDataModelId>",
-                integrationId = "<integrationId>",
-                hardwareId = "<hardwareId>",
-                deviceId = "<deviceId>",
-                type = "<type>",
-                location = new
+                ["sensorDataModelId"] = "<sensorDataModelId>",
+                ["integrationId"] = "<integrationId>",
+                ["hardwareId"] = "<hardwareId>",
+                ["deviceId"] = "<deviceId>",
+                ["type"] = "<type>",
+                ["location"] = new Dictionary<string, object>()
                 {
-                    latitude = 123.45d,
-                    longitude = 123.45d,
+                    ["latitude"] = 123.45,
+                    ["longitude"] = 123.45,
                 },
-                port = new
+                ["port"] = new Dictionary<string, object>()
                 {
-                    name = "<name>",
-                    type = "<type>",
+                    ["name"] = "<name>",
+                    ["type"] = "<type>",
                 },
-                depthInMeters = new[] {
-        123.45d
-    },
-                status = "<status>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["depthInMeters"] = new List<object>()
+{
+123.45
+},
+                ["status"] = "<status>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<sensorPartnerId>", "<sensorId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("sensorDataModelId").ToString());
@@ -170,17 +168,17 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensor()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSensor("<sensorPartnerId>", "<sensorId>", new RequestContext());
+            Response response = client.GetSensor("<sensorPartnerId>", "<sensorId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -190,10 +188,10 @@ public void Example_GetSensor()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensor_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetSensor("<sensorPartnerId>", "<sensorId>", new RequestContext());
+            Response response = client.GetSensor("<sensorPartnerId>", "<sensorId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("sensorDataModelId").ToString());
@@ -216,17 +214,17 @@ public void Example_GetSensor_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensor_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSensorAsync("<sensorPartnerId>", "<sensorId>", new RequestContext());
+            Response response = await client.GetSensorAsync("<sensorPartnerId>", "<sensorId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -236,10 +234,10 @@ public async Task Example_GetSensor_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensor_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetSensorAsync("<sensorPartnerId>", "<sensorId>", new RequestContext());
+            Response response = await client.GetSensorAsync("<sensorPartnerId>", "<sensorId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("sensorDataModelId").ToString());
@@ -262,15 +260,15 @@ public async Task Example_GetSensor_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<sensorPartnerId>", "<sensorId>");
             Console.WriteLine(response.Status);
@@ -280,8 +278,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<sensorPartnerId>", "<sensorId>");
             Console.WriteLine(response.Status);
@@ -291,8 +289,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<sensorPartnerId>", "<sensorId>");
             Console.WriteLine(response.Status);
@@ -302,8 +300,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<sensorPartnerId>", "<sensorId>");
             Console.WriteLine(response.Status);
@@ -313,10 +311,10 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetConnectionString()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetConnectionString("<sensorPartnerId>", "<sensorId>", new RequestContext());
+            Response response = client.GetConnectionString("<sensorPartnerId>", "<sensorId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -326,10 +324,10 @@ public void Example_GetConnectionString()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetConnectionString_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetConnectionString("<sensorPartnerId>", "<sensorId>", new RequestContext());
+            Response response = client.GetConnectionString("<sensorPartnerId>", "<sensorId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("primaryDeviceConnectionString").ToString());
@@ -340,10 +338,10 @@ public void Example_GetConnectionString_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetConnectionString_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetConnectionStringAsync("<sensorPartnerId>", "<sensorId>", new RequestContext());
+            Response response = await client.GetConnectionStringAsync("<sensorPartnerId>", "<sensorId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -353,10 +351,10 @@ public async Task Example_GetConnectionString_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetConnectionString_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetConnectionStringAsync("<sensorPartnerId>", "<sensorId>", new RequestContext());
+            Response response = await client.GetConnectionStringAsync("<sensorPartnerId>", "<sensorId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("primaryDeviceConnectionString").ToString());
@@ -367,15 +365,14 @@ public async Task Example_GetConnectionString_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_RenewConnectionString()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                connectionStringType = "Primary",
-            };
-
-            Response response = client.RenewConnectionString("<sensorPartnerId>", "<sensorId>", RequestContent.Create(data));
+                ["connectionStringType"] = "Primary",
+            });
+            Response response = client.RenewConnectionString("<sensorPartnerId>", "<sensorId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -385,15 +382,14 @@ public void Example_RenewConnectionString()
         [Ignore("Only validating compilation of examples")]
         public void Example_RenewConnectionString_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                connectionStringType = "Primary",
-            };
-
-            Response response = client.RenewConnectionString("<sensorPartnerId>", "<sensorId>", RequestContent.Create(data));
+                ["connectionStringType"] = "Primary",
+            });
+            Response response = client.RenewConnectionString("<sensorPartnerId>", "<sensorId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("primaryDeviceConnectionString").ToString());
@@ -404,15 +400,14 @@ public void Example_RenewConnectionString_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RenewConnectionString_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                connectionStringType = "Primary",
-            };
-
-            Response response = await client.RenewConnectionStringAsync("<sensorPartnerId>", "<sensorId>", RequestContent.Create(data));
+                ["connectionStringType"] = "Primary",
+            });
+            Response response = await client.RenewConnectionStringAsync("<sensorPartnerId>", "<sensorId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -422,15 +417,14 @@ public async Task Example_RenewConnectionString_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RenewConnectionString_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                connectionStringType = "Primary",
-            };
-
-            Response response = await client.RenewConnectionStringAsync("<sensorPartnerId>", "<sensorId>", RequestContent.Create(data));
+                ["connectionStringType"] = "Primary",
+            });
+            Response response = await client.RenewConnectionStringAsync("<sensorPartnerId>", "<sensorId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("primaryDeviceConnectionString").ToString());
@@ -441,13 +435,13 @@ public async Task Example_RenewConnectionString_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensors()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetSensors("<sensorPartnerId>", new string[] { "<sensorDataModelIds>" }, new string[] { "<sensorMappingIds>" }, new string[] { "<deviceIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetSensors("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -455,33 +449,54 @@ public void Example_GetSensors()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSensors_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetSensors("<sensorPartnerId>", new string[] { "<sensorDataModelIds>" }, new string[] { "<sensorMappingIds>" }, new string[] { "<deviceIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetSensors("<sensorPartnerId>", new List<string>()
+{
+"<sensorDataModelIds>"
+}, new List<string>()
+{
+"<sensorMappingIds>"
+}, new List<string>()
+{
+"<deviceIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("sensorDataModelId").ToString());
-                Console.WriteLine(result.GetProperty("integrationId").ToString());
-                Console.WriteLine(result.GetProperty("hardwareId").ToString());
-                Console.WriteLine(result.GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("latitude").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("longitude").ToString());
-                Console.WriteLine(result.GetProperty("port").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("port").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("depthInMeters")[0].ToString());
-                Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("sensorDataModelId").ToString());
+                Console.WriteLine(result[0].GetProperty("integrationId").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+                Console.WriteLine(result[0].GetProperty("port").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("port").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("depthInMeters")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -489,13 +504,13 @@ public void Example_GetSensors_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensors_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetSensorsAsync("<sensorPartnerId>", new string[] { "<sensorDataModelIds>" }, new string[] { "<sensorMappingIds>" }, new string[] { "<deviceIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSensorsAsync("<sensorPartnerId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -503,33 +518,54 @@ public async Task Example_GetSensors_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSensors_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSensorsClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Sensors client = new FarmBeatsClient(credential).GetSensorsClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetSensorsAsync("<sensorPartnerId>", new string[] { "<sensorDataModelIds>" }, new string[] { "<sensorMappingIds>" }, new string[] { "<deviceIds>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSensorsAsync("<sensorPartnerId>", new List<string>()
+{
+"<sensorDataModelIds>"
+}, new List<string>()
+{
+"<sensorMappingIds>"
+}, new List<string>()
+{
+"<deviceIds>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("sensorDataModelId").ToString());
-                Console.WriteLine(result.GetProperty("integrationId").ToString());
-                Console.WriteLine(result.GetProperty("hardwareId").ToString());
-                Console.WriteLine(result.GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("latitude").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("longitude").ToString());
-                Console.WriteLine(result.GetProperty("port").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("port").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("depthInMeters")[0].ToString());
-                Console.WriteLine(result.GetProperty("sensorPartnerId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("sensorDataModelId").ToString());
+                Console.WriteLine(result[0].GetProperty("integrationId").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+                Console.WriteLine(result[0].GetProperty("port").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("port").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("depthInMeters")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("sensorPartnerId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
     }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SolutionInference.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SolutionInference.cs
index 56f1c0887b0f..40c15da943ea 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SolutionInference.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_SolutionInference.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,244 +23,232 @@ internal class Samples_SolutionInference
         [Ignore("Only validating compilation of examples")]
         public void Example_Cancel()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                requestPath = "<requestPath>",
-            };
-
-            Response response = client.Cancel("<solutionId>", RequestContent.Create(data));
+                ["requestPath"] = "<requestPath>",
+            });
+            Response response = client.Cancel("<solutionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Cancel_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                requestPath = "<requestPath>",
-                partnerRequestBody = new
+                ["requestPath"] = "<requestPath>",
+                ["partnerRequestBody"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.Cancel("<solutionId>", RequestContent.Create(data));
+            });
+            Response response = client.Cancel("<solutionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Cancel_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                requestPath = "<requestPath>",
-            };
-
-            Response response = await client.CancelAsync("<solutionId>", RequestContent.Create(data));
+                ["requestPath"] = "<requestPath>",
+            });
+            Response response = await client.CancelAsync("<solutionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Cancel_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                requestPath = "<requestPath>",
-                partnerRequestBody = new
+                ["requestPath"] = "<requestPath>",
+                ["partnerRequestBody"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CancelAsync("<solutionId>", RequestContent.Create(data));
+            });
+            Response response = await client.CancelAsync("<solutionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Fetch()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                requestPath = "<requestPath>",
-            };
-
-            Response response = client.Fetch("<solutionId>", RequestContent.Create(data));
+                ["requestPath"] = "<requestPath>",
+            });
+            Response response = client.Fetch("<solutionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Fetch_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                requestPath = "<requestPath>",
-                partnerRequestBody = new
+                ["requestPath"] = "<requestPath>",
+                ["partnerRequestBody"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.Fetch("<solutionId>", RequestContent.Create(data));
+            });
+            Response response = client.Fetch("<solutionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Fetch_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                requestPath = "<requestPath>",
-            };
-
-            Response response = await client.FetchAsync("<solutionId>", RequestContent.Create(data));
+                ["requestPath"] = "<requestPath>",
+            });
+            Response response = await client.FetchAsync("<solutionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Fetch_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                requestPath = "<requestPath>",
-                partnerRequestBody = new
+                ["requestPath"] = "<requestPath>",
+                ["partnerRequestBody"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.FetchAsync("<solutionId>", RequestContent.Create(data));
+            });
+            Response response = await client.FetchAsync("<solutionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                requestPath = "<requestPath>",
-            };
-
-            var operation = client.CreateOrUpdate(WaitUntil.Completed, "<solutionId>", RequestContent.Create(data));
-
+                ["requestPath"] = "<requestPath>",
+            });
+            Operation<BinaryData> operation = client.CreateOrUpdate(WaitUntil.Completed, "<solutionId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
-            Console.WriteLine(result.GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                requestPath = "<requestPath>",
-                partnerRequestBody = new
+                ["requestPath"] = "<requestPath>",
+                ["partnerRequestBody"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = client.CreateOrUpdate(WaitUntil.Completed, "<solutionId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.CreateOrUpdate(WaitUntil.Completed, "<solutionId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
-            Console.WriteLine(result.GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                requestPath = "<requestPath>",
-            };
-
-            var operation = await client.CreateOrUpdateAsync(WaitUntil.Completed, "<solutionId>", RequestContent.Create(data));
-
+                ["requestPath"] = "<requestPath>",
+            });
+            Operation<BinaryData> operation = await client.CreateOrUpdateAsync(WaitUntil.Completed, "<solutionId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
-            Console.WriteLine(result.GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetSolutionInferenceClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            SolutionInference client = new FarmBeatsClient(credential).GetSolutionInferenceClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                requestPath = "<requestPath>",
-                partnerRequestBody = new
+                ["requestPath"] = "<requestPath>",
+                ["partnerRequestBody"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = await client.CreateOrUpdateAsync(WaitUntil.Completed, "<solutionId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.CreateOrUpdateAsync(WaitUntil.Completed, "<solutionId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
-            Console.WriteLine(result.GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("<key>").ToString());
         }
     }
 }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_TillageData.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_TillageData.cs
index 3a76cfba8581..5d62c012952d 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_TillageData.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_TillageData.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_TillageData
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTillageData()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetTillageData("<partyId>", "<tillageDataId>", new RequestContext());
+            Response response = client.GetTillageData("<partyId>", "<tillageDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,10 +36,10 @@ public void Example_GetTillageData()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTillageData_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetTillageData("<partyId>", "<tillageDataId>", new RequestContext());
+            Response response = client.GetTillageData("<partyId>", "<tillageDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
@@ -64,17 +64,17 @@ public void Example_GetTillageData_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTillageData_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetTillageDataAsync("<partyId>", "<tillageDataId>", new RequestContext());
+            Response response = await client.GetTillageDataAsync("<partyId>", "<tillageDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -84,10 +84,10 @@ public async Task Example_GetTillageData_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTillageData_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetTillageDataAsync("<partyId>", "<tillageDataId>", new RequestContext());
+            Response response = await client.GetTillageDataAsync("<partyId>", "<tillageDataId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
@@ -112,19 +112,18 @@ public async Task Example_GetTillageData_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<tillageDataId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<tillageDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -134,41 +133,34 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                tillageDepth = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                tillagePressure = new
+                ["tillageDepth"] = new Dictionary<string, object>()
                 {
-                    unit = "<unit>",
-                    value = 123.45d,
+                    ["unit"] = "<unit>",
+                    ["value"] = 123.45,
                 },
-                area = new
+                ["tillagePressure"] = null
+            ,
+                ["area"] = null
+            ,
+                ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["associatedBoundaryId"] = "<associatedBoundaryId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    unit = "<unit>",
-                    value = 123.45d,
+                    ["key"] = new Dictionary<string, object>(),
                 },
-                operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                associatedBoundaryId = "<associatedBoundaryId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
-                {
-                    key = new { },
-                },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<tillageDataId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<tillageDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
@@ -193,19 +185,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<tillageDataId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<tillageDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -215,41 +206,34 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                tillageDepth = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                tillagePressure = new
-                {
-                    unit = "<unit>",
-                    value = 123.45d,
-                },
-                area = new
+                ["tillageDepth"] = new Dictionary<string, object>()
                 {
-                    unit = "<unit>",
-                    value = 123.45d,
+                    ["unit"] = "<unit>",
+                    ["value"] = 123.45,
                 },
-                operationModifiedDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationStartDateTime = "2022-05-10T18:57:31.2311892Z",
-                operationEndDateTime = "2022-05-10T18:57:31.2311892Z",
-                associatedBoundaryId = "<associatedBoundaryId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["tillagePressure"] = null
+            ,
+                ["area"] = null
+            ,
+                ["operationModifiedDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationStartDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["operationEndDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["associatedBoundaryId"] = "<associatedBoundaryId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<tillageDataId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<tillageDataId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
@@ -274,15 +258,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<tillageDataId>");
             Console.WriteLine(response.Status);
@@ -292,8 +276,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<tillageDataId>");
             Console.WriteLine(response.Status);
@@ -303,8 +287,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<tillageDataId>");
             Console.WriteLine(response.Status);
@@ -314,8 +298,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<tillageDataId>");
             Console.WriteLine(response.Status);
@@ -325,10 +309,10 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -340,10 +324,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -364,10 +348,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -379,10 +363,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -403,13 +387,13 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllTillageDataByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllTillageDataByPartyId("<partyId>", 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllTillageDataByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -417,35 +401,53 @@ public void Example_GetAllTillageDataByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllTillageDataByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllTillageDataByPartyId("<partyId>", 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllTillageDataByPartyId("<partyId>", 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -453,13 +455,13 @@ public void Example_GetAllTillageDataByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllTillageDataByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllTillageDataByPartyIdAsync("<partyId>", 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllTillageDataByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -467,35 +469,53 @@ public async Task Example_GetAllTillageDataByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllTillageDataByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllTillageDataByPartyIdAsync("<partyId>", 3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllTillageDataByPartyIdAsync("<partyId>", 123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -503,13 +523,13 @@ public async Task Example_GetAllTillageDataByPartyId_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllTillageData()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllTillageData(3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<tillageDataIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllTillageData(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -517,35 +537,53 @@ public void Example_GetAllTillageData()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllTillageData_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetAllTillageData(3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<tillageDataIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllTillageData(123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<tillageDataIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -553,13 +591,13 @@ public void Example_GetAllTillageData_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllTillageData_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllTillageDataAsync(3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<tillageDataIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllTillageDataAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -567,35 +605,53 @@ public async Task Example_GetAllTillageData_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllTillageData_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetAllTillageDataAsync(3.14, 3.14, 3.14, 3.14, new string[] { "<sources>" }, new string[] { "<associatedBoundaryIds>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 3.14, 3.14, new string[] { "<tillageDataIds>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllTillageDataAsync(123.45, 123.45, 123.45, 123.45, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<associatedBoundaryIds>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 123.45, 123.45, new List<string>()
+{
+"<tillageDataIds>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("tillageDepth").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("tillagePressure").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("area").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("operationModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationStartDateTime").ToString());
-                Console.WriteLine(result.GetProperty("operationEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("attachmentsLink").ToString());
-                Console.WriteLine(result.GetProperty("associatedBoundaryId").ToString());
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("tillageDepth").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("tillagePressure").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("area").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("operationModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationStartDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("attachmentsLink").ToString());
+                Console.WriteLine(result[0].GetProperty("associatedBoundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -603,12 +659,12 @@ public async Task Example_GetAllTillageData_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<tillageDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<tillageDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -619,12 +675,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<tillageDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<tillageDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -644,12 +700,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<tillageDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<tillageDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -660,12 +716,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetTillageDataClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<tillageDataId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            TillageData client = new FarmBeatsClient(credential).GetTillageDataClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<tillageDataId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Weather.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Weather.cs
index 91c100816202..ce26f7e1b6cb 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Weather.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Weather.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_Weather
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDataDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetDataDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetDataDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("extensionId").ToString());
@@ -38,10 +38,10 @@ public void Example_GetDataDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDataDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetDataDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetDataDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("extensionId").ToString());
@@ -64,17 +64,17 @@ public void Example_GetDataDeleteJobDetails_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDataDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetDataDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetDataDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("extensionId").ToString());
@@ -86,10 +86,10 @@ public async Task Example_GetDataDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDataDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetDataDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetDataDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("extensionId").ToString());
@@ -112,41 +112,41 @@ public async Task Example_GetDataDeleteJobDetails_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDataIngestionJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetDataIngestionJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetDataIngestionJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("extensionId").ToString());
             Console.WriteLine(result.GetProperty("extensionApiName").ToString());
-            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDataIngestionJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetDataIngestionJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetDataIngestionJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("extensionId").ToString());
             Console.WriteLine(result.GetProperty("extensionApiName").ToString());
-            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("extensionDataProviderAppId").ToString());
             Console.WriteLine(result.GetProperty("extensionDataProviderApiKey").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -162,41 +162,41 @@ public void Example_GetDataIngestionJobDetails_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDataIngestionJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetDataIngestionJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetDataIngestionJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("extensionId").ToString());
             Console.WriteLine(result.GetProperty("extensionApiName").ToString());
-            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDataIngestionJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetDataIngestionJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetDataIngestionJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("extensionId").ToString());
             Console.WriteLine(result.GetProperty("extensionApiName").ToString());
-            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("extensionDataProviderAppId").ToString());
             Console.WriteLine(result.GetProperty("extensionDataProviderApiKey").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -212,28 +212,28 @@ public async Task Example_GetDataIngestionJobDetails_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWeathers()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetWeathers("<partyId>", "<boundaryId>", "<extensionId>", "<weatherDataType>", "<granularity>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetWeathers("<partyId>", "<boundaryId>", "<extensionId>", "<weatherDataType>", "<granularity>", null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("boundaryId").ToString());
-                Console.WriteLine(result.GetProperty("extensionId").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("latitude").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("longitude").ToString());
-                Console.WriteLine(result.GetProperty("dateTime").ToString());
-                Console.WriteLine(result.GetProperty("extensionVersion").ToString());
-                Console.WriteLine(result.GetProperty("weatherDataType").ToString());
-                Console.WriteLine(result.GetProperty("granularity").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("extensionId").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+                Console.WriteLine(result[0].GetProperty("dateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("extensionVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("weatherDataType").ToString());
+                Console.WriteLine(result[0].GetProperty("granularity").ToString());
             }
         }
 
@@ -241,57 +241,57 @@ public void Example_GetWeathers()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWeathers_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetWeathers("<partyId>", "<boundaryId>", "<extensionId>", "<weatherDataType>", "<granularity>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetWeathers("<partyId>", "<boundaryId>", "<extensionId>", "<weatherDataType>", "<granularity>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("boundaryId").ToString());
-                Console.WriteLine(result.GetProperty("extensionId").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("latitude").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("longitude").ToString());
-                Console.WriteLine(result.GetProperty("dateTime").ToString());
-                Console.WriteLine(result.GetProperty("unitSystemCode").ToString());
-                Console.WriteLine(result.GetProperty("extensionVersion").ToString());
-                Console.WriteLine(result.GetProperty("weatherDataType").ToString());
-                Console.WriteLine(result.GetProperty("granularity").ToString());
-                Console.WriteLine(result.GetProperty("cloudCover").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("cloudCover").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("dewPoint").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("dewPoint").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("growingDegreeDay").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("growingDegreeDay").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("precipitation").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("precipitation").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("pressure").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("pressure").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("relativeHumidity").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("relativeHumidity").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("soilMoisture").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("soilMoisture").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("soilTemperature").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("soilTemperature").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("temperature").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("temperature").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("visibility").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("visibility").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("wetBulbTemperature").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("wetBulbTemperature").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("windChill").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("windChill").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("windDirection").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("windDirection").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("windGust").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("windGust").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("windSpeed").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("windSpeed").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("extensionId").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+                Console.WriteLine(result[0].GetProperty("dateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("unitSystemCode").ToString());
+                Console.WriteLine(result[0].GetProperty("extensionVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("weatherDataType").ToString());
+                Console.WriteLine(result[0].GetProperty("granularity").ToString());
+                Console.WriteLine(result[0].GetProperty("cloudCover").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("cloudCover").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("dewPoint").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("dewPoint").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("growingDegreeDay").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("growingDegreeDay").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("precipitation").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("precipitation").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("pressure").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("pressure").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("relativeHumidity").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("relativeHumidity").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("soilMoisture").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("soilMoisture").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("soilTemperature").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("soilTemperature").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("temperature").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("temperature").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("visibility").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("visibility").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("wetBulbTemperature").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("wetBulbTemperature").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("windChill").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("windChill").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("windDirection").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("windDirection").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("windGust").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("windGust").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("windSpeed").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("windSpeed").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -299,21 +299,21 @@ public void Example_GetWeathers_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWeathers_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetWeathersAsync("<partyId>", "<boundaryId>", "<extensionId>", "<weatherDataType>", "<granularity>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetWeathersAsync("<partyId>", "<boundaryId>", "<extensionId>", "<weatherDataType>", "<granularity>", null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("boundaryId").ToString());
-                Console.WriteLine(result.GetProperty("extensionId").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("latitude").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("longitude").ToString());
-                Console.WriteLine(result.GetProperty("dateTime").ToString());
-                Console.WriteLine(result.GetProperty("extensionVersion").ToString());
-                Console.WriteLine(result.GetProperty("weatherDataType").ToString());
-                Console.WriteLine(result.GetProperty("granularity").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("extensionId").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+                Console.WriteLine(result[0].GetProperty("dateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("extensionVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("weatherDataType").ToString());
+                Console.WriteLine(result[0].GetProperty("granularity").ToString());
             }
         }
 
@@ -321,57 +321,57 @@ public async Task Example_GetWeathers_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWeathers_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetWeathersAsync("<partyId>", "<boundaryId>", "<extensionId>", "<weatherDataType>", "<granularity>", DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetWeathersAsync("<partyId>", "<boundaryId>", "<extensionId>", "<weatherDataType>", "<granularity>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("boundaryId").ToString());
-                Console.WriteLine(result.GetProperty("extensionId").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("latitude").ToString());
-                Console.WriteLine(result.GetProperty("location").GetProperty("longitude").ToString());
-                Console.WriteLine(result.GetProperty("dateTime").ToString());
-                Console.WriteLine(result.GetProperty("unitSystemCode").ToString());
-                Console.WriteLine(result.GetProperty("extensionVersion").ToString());
-                Console.WriteLine(result.GetProperty("weatherDataType").ToString());
-                Console.WriteLine(result.GetProperty("granularity").ToString());
-                Console.WriteLine(result.GetProperty("cloudCover").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("cloudCover").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("dewPoint").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("dewPoint").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("growingDegreeDay").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("growingDegreeDay").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("precipitation").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("precipitation").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("pressure").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("pressure").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("relativeHumidity").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("relativeHumidity").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("soilMoisture").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("soilMoisture").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("soilTemperature").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("soilTemperature").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("temperature").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("temperature").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("visibility").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("visibility").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("wetBulbTemperature").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("wetBulbTemperature").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("windChill").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("windChill").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("windDirection").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("windDirection").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("windGust").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("windGust").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("windSpeed").GetProperty("unit").ToString());
-                Console.WriteLine(result.GetProperty("windSpeed").GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("boundaryId").ToString());
+                Console.WriteLine(result[0].GetProperty("extensionId").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("latitude").ToString());
+                Console.WriteLine(result[0].GetProperty("location").GetProperty("longitude").ToString());
+                Console.WriteLine(result[0].GetProperty("dateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("unitSystemCode").ToString());
+                Console.WriteLine(result[0].GetProperty("extensionVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("weatherDataType").ToString());
+                Console.WriteLine(result[0].GetProperty("granularity").ToString());
+                Console.WriteLine(result[0].GetProperty("cloudCover").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("cloudCover").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("dewPoint").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("dewPoint").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("growingDegreeDay").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("growingDegreeDay").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("precipitation").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("precipitation").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("pressure").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("pressure").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("relativeHumidity").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("relativeHumidity").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("soilMoisture").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("soilMoisture").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("soilTemperature").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("soilTemperature").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("temperature").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("temperature").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("visibility").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("visibility").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("wetBulbTemperature").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("wetBulbTemperature").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("windChill").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("windChill").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("windDirection").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("windDirection").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("windGust").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("windGust").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("windSpeed").GetProperty("unit").ToString());
+                Console.WriteLine(result[0].GetProperty("windSpeed").GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -379,19 +379,18 @@ public async Task Example_GetWeathers_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateDataDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                extensionId = "<extensionId>",
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-            };
-
-            var operation = client.CreateDataDeleteJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+                ["extensionId"] = "<extensionId>",
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+            });
+            Operation<BinaryData> operation = client.CreateDataDeleteJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("extensionId").ToString());
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -402,29 +401,28 @@ public void Example_CreateDataDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateDataDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                extensionId = "<extensionId>",
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                weatherDataType = "<weatherDataType>",
-                granularity = "<granularity>",
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                endDateTime = "2022-05-10T18:57:31.2311892Z",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["extensionId"] = "<extensionId>",
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["weatherDataType"] = "<weatherDataType>",
+                ["granularity"] = "<granularity>",
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = client.CreateDataDeleteJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.CreateDataDeleteJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("extensionId").ToString());
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -446,26 +444,25 @@ public void Example_CreateDataDeleteJob_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateDataDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                extensionId = "<extensionId>",
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-            };
-
-            var operation = await client.CreateDataDeleteJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+                ["extensionId"] = "<extensionId>",
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+            });
+            Operation<BinaryData> operation = await client.CreateDataDeleteJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("extensionId").ToString());
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -476,29 +473,28 @@ public async Task Example_CreateDataDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateDataDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                extensionId = "<extensionId>",
-                partyId = "<partyId>",
-                boundaryId = "<boundaryId>",
-                weatherDataType = "<weatherDataType>",
-                granularity = "<granularity>",
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                endDateTime = "2022-05-10T18:57:31.2311892Z",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["extensionId"] = "<extensionId>",
+                ["partyId"] = "<partyId>",
+                ["boundaryId"] = "<boundaryId>",
+                ["weatherDataType"] = "<weatherDataType>",
+                ["granularity"] = "<granularity>",
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["endDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = await client.CreateDataDeleteJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.CreateDataDeleteJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("extensionId").ToString());
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -520,75 +516,73 @@ public async Task Example_CreateDataDeleteJob_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateDataIngestionJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                boundaryId = "<boundaryId>",
-                partyId = "<partyId>",
-                extensionId = "<extensionId>",
-                extensionApiName = "<extensionApiName>",
-                extensionApiInput = new
+                ["boundaryId"] = "<boundaryId>",
+                ["partyId"] = "<partyId>",
+                ["extensionId"] = "<extensionId>",
+                ["extensionApiName"] = "<extensionApiName>",
+                ["extensionApiInput"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = client.CreateDataIngestionJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.CreateDataIngestionJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("extensionId").ToString());
             Console.WriteLine(result.GetProperty("extensionApiName").ToString());
-            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateDataIngestionJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                boundaryId = "<boundaryId>",
-                partyId = "<partyId>",
-                extensionId = "<extensionId>",
-                extensionApiName = "<extensionApiName>",
-                extensionApiInput = new
+                ["boundaryId"] = "<boundaryId>",
+                ["partyId"] = "<partyId>",
+                ["extensionId"] = "<extensionId>",
+                ["extensionApiName"] = "<extensionApiName>",
+                ["extensionApiInput"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-                extensionDataProviderAppId = "<extensionDataProviderAppId>",
-                extensionDataProviderApiKey = "<extensionDataProviderApiKey>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["extensionDataProviderAppId"] = "<extensionDataProviderAppId>",
+                ["extensionDataProviderApiKey"] = "<extensionDataProviderApiKey>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = client.CreateDataIngestionJob(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.CreateDataIngestionJob(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("extensionId").ToString());
             Console.WriteLine(result.GetProperty("extensionApiName").ToString());
-            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("extensionDataProviderAppId").ToString());
             Console.WriteLine(result.GetProperty("extensionDataProviderApiKey").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -604,75 +598,73 @@ public void Example_CreateDataIngestionJob_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateDataIngestionJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                boundaryId = "<boundaryId>",
-                partyId = "<partyId>",
-                extensionId = "<extensionId>",
-                extensionApiName = "<extensionApiName>",
-                extensionApiInput = new
+                ["boundaryId"] = "<boundaryId>",
+                ["partyId"] = "<partyId>",
+                ["extensionId"] = "<extensionId>",
+                ["extensionApiName"] = "<extensionApiName>",
+                ["extensionApiInput"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = await client.CreateDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.CreateDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("extensionId").ToString());
             Console.WriteLine(result.GetProperty("extensionApiName").ToString());
-            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateDataIngestionJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Weather client = new FarmBeatsClient(credential).GetWeatherClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                boundaryId = "<boundaryId>",
-                partyId = "<partyId>",
-                extensionId = "<extensionId>",
-                extensionApiName = "<extensionApiName>",
-                extensionApiInput = new
+                ["boundaryId"] = "<boundaryId>",
+                ["partyId"] = "<partyId>",
+                ["extensionId"] = "<extensionId>",
+                ["extensionApiName"] = "<extensionApiName>",
+                ["extensionApiInput"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-                extensionDataProviderAppId = "<extensionDataProviderAppId>",
-                extensionDataProviderApiKey = "<extensionDataProviderApiKey>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["extensionDataProviderAppId"] = "<extensionDataProviderAppId>",
+                ["extensionDataProviderApiKey"] = "<extensionDataProviderApiKey>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            var operation = await client.CreateDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.CreateDataIngestionJobAsync(WaitUntil.Completed, "<jobId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("boundaryId").ToString());
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("extensionId").ToString());
             Console.WriteLine(result.GetProperty("extensionApiName").ToString());
-            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("extensionApiInput").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("extensionDataProviderAppId").ToString());
             Console.WriteLine(result.GetProperty("extensionDataProviderApiKey").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -688,7 +680,7 @@ public async Task Example_CreateDataIngestionJob_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
     }
 }
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_WeatherData.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_WeatherData.cs
index 84ea035029bf..dfec38d43b82 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_WeatherData.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_WeatherData.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,18 +23,17 @@ internal class Samples_WeatherData
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWeatherData()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            WeatherData client = new FarmBeatsClient(credential).GetWeatherDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                providerApiKey = "<providerApiKey>",
-                extensionId = "<extensionId>",
-                extensionApiName = "<extensionApiName>",
-                units = "<units>",
-            };
-
-            Response response = client.GetWeatherData(RequestContent.Create(data));
+                ["providerApiKey"] = "<providerApiKey>",
+                ["extensionId"] = "<extensionId>",
+                ["extensionApiName"] = "<extensionApiName>",
+                ["units"] = "<units>",
+            });
+            Response response = client.GetWeatherData(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("weatherMetadata").GetProperty("extensionVersion").ToString());
@@ -48,34 +47,35 @@ public void Example_GetWeatherData()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWeatherData_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            WeatherData client = new FarmBeatsClient(credential).GetWeatherDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                locations = new[] {
-        new {
-            type = "LatLong",
-            value = "<value>",
-        }
-    },
-                providerAppId = "<providerAppId>",
-                providerApiKey = "<providerApiKey>",
-                extensionId = "<extensionId>",
-                extensionApiName = "<extensionApiName>",
-                language = "<language>",
-                startTimeHours = 1234,
-                endTimeHours = 1234,
-                duration = 1234,
-                units = "<units>",
-                additionalParams = new
+                ["locations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "LatLong",
+["value"] = "<value>",
+}
+},
+                ["providerAppId"] = "<providerAppId>",
+                ["providerApiKey"] = "<providerApiKey>",
+                ["extensionId"] = "<extensionId>",
+                ["extensionApiName"] = "<extensionApiName>",
+                ["language"] = "<language>",
+                ["startTimeHours"] = 1234,
+                ["endTimeHours"] = 1234,
+                ["duration"] = 1234,
+                ["units"] = "<units>",
+                ["additionalParams"] = new Dictionary<string, object>()
                 {
-                    iconResolution = "<iconResolution>",
-                    details = true,
+                    ["iconResolution"] = "<iconResolution>",
+                    ["details"] = true,
                 },
-            };
-
-            Response response = client.GetWeatherData(RequestContent.Create(data));
+            });
+            Response response = client.GetWeatherData(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("weatherMetadata").GetProperty("extensionVersion").ToString());
@@ -132,7 +132,7 @@ public void Example_GetWeatherData_AllParameters()
             Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("windSpeed").GetProperty("values")[0].ToString());
             Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("wxPhraseLong")[0].ToString());
             Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("wxPhraseShort")[0].ToString());
-            Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("additionalAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("additionalAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("location").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("location").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("code").ToString());
@@ -144,18 +144,17 @@ public void Example_GetWeatherData_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWeatherData_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            WeatherData client = new FarmBeatsClient(credential).GetWeatherDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                providerApiKey = "<providerApiKey>",
-                extensionId = "<extensionId>",
-                extensionApiName = "<extensionApiName>",
-                units = "<units>",
-            };
-
-            Response response = await client.GetWeatherDataAsync(RequestContent.Create(data));
+                ["providerApiKey"] = "<providerApiKey>",
+                ["extensionId"] = "<extensionId>",
+                ["extensionApiName"] = "<extensionApiName>",
+                ["units"] = "<units>",
+            });
+            Response response = await client.GetWeatherDataAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("weatherMetadata").GetProperty("extensionVersion").ToString());
@@ -169,34 +168,35 @@ public async Task Example_GetWeatherData_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWeatherData_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetWeatherDataClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            WeatherData client = new FarmBeatsClient(credential).GetWeatherDataClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                locations = new[] {
-        new {
-            type = "LatLong",
-            value = "<value>",
-        }
-    },
-                providerAppId = "<providerAppId>",
-                providerApiKey = "<providerApiKey>",
-                extensionId = "<extensionId>",
-                extensionApiName = "<extensionApiName>",
-                language = "<language>",
-                startTimeHours = 1234,
-                endTimeHours = 1234,
-                duration = 1234,
-                units = "<units>",
-                additionalParams = new
+                ["locations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "LatLong",
+["value"] = "<value>",
+}
+},
+                ["providerAppId"] = "<providerAppId>",
+                ["providerApiKey"] = "<providerApiKey>",
+                ["extensionId"] = "<extensionId>",
+                ["extensionApiName"] = "<extensionApiName>",
+                ["language"] = "<language>",
+                ["startTimeHours"] = 1234,
+                ["endTimeHours"] = 1234,
+                ["duration"] = 1234,
+                ["units"] = "<units>",
+                ["additionalParams"] = new Dictionary<string, object>()
                 {
-                    iconResolution = "<iconResolution>",
-                    details = true,
+                    ["iconResolution"] = "<iconResolution>",
+                    ["details"] = true,
                 },
-            };
-
-            Response response = await client.GetWeatherDataAsync(RequestContent.Create(data));
+            });
+            Response response = await client.GetWeatherDataAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("weatherMetadata").GetProperty("extensionVersion").ToString());
@@ -253,7 +253,7 @@ public async Task Example_GetWeatherData_AllParameters_Async()
             Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("windSpeed").GetProperty("values")[0].ToString());
             Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("wxPhraseLong")[0].ToString());
             Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("wxPhraseShort")[0].ToString());
-            Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("additionalAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("locations")[0].GetProperty("data").GetProperty("additionalAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("location").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("location").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("errors").GetProperty("locations")[0].GetProperty("code").ToString());
diff --git a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Zones.cs b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Zones.cs
index 382dfc70a667..093e4098987b 100644
--- a/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Zones.cs
+++ b/sdk/agrifood/Azure.Verticals.AgriFood.Farming/tests/Generated/Samples/Samples_Zones.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Verticals.AgriFood.Farming;
 using NUnit.Framework;
 
 namespace Azure.Verticals.AgriFood.Farming.Samples
@@ -23,10 +23,10 @@ internal class Samples_Zones
         [Ignore("Only validating compilation of examples")]
         public void Example_GetZone()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetZone("<partyId>", "<zoneId>", new RequestContext());
+            Response response = client.GetZone("<partyId>", "<zoneId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,10 +36,10 @@ public void Example_GetZone()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetZone_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetZone("<partyId>", "<zoneId>", new RequestContext());
+            Response response = client.GetZone("<partyId>", "<zoneId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -55,17 +55,17 @@ public void Example_GetZone_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetZone_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetZoneAsync("<partyId>", "<zoneId>", new RequestContext());
+            Response response = await client.GetZoneAsync("<partyId>", "<zoneId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -75,10 +75,10 @@ public async Task Example_GetZone_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetZone_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetZoneAsync("<partyId>", "<zoneId>", new RequestContext());
+            Response response = await client.GetZoneAsync("<partyId>", "<zoneId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -94,19 +94,18 @@ public async Task Example_GetZone_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<zoneId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate("<partyId>", "<zoneId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -116,24 +115,23 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                type = "<type>",
-                managementZoneId = "<managementZoneId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["type"] = "<type>",
+                ["managementZoneId"] = "<managementZoneId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdate("<partyId>", "<zoneId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate("<partyId>", "<zoneId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -149,19 +147,18 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
-
-            var data = new { };
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<zoneId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<zoneId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -171,24 +168,23 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                type = "<type>",
-                managementZoneId = "<managementZoneId>",
-                status = "<status>",
-                source = "<source>",
-                name = "<name>",
-                description = "<description>",
-                properties = new
+                ["type"] = "<type>",
+                ["managementZoneId"] = "<managementZoneId>",
+                ["status"] = "<status>",
+                ["source"] = "<source>",
+                ["name"] = "<name>",
+                ["description"] = "<description>",
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAsync("<partyId>", "<zoneId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync("<partyId>", "<zoneId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -204,15 +200,15 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<zoneId>");
             Console.WriteLine(response.Status);
@@ -222,8 +218,8 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
             Response response = client.Delete("<partyId>", "<zoneId>");
             Console.WriteLine(response.Status);
@@ -233,8 +229,8 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<zoneId>");
             Console.WriteLine(response.Status);
@@ -244,8 +240,8 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
             Response response = await client.DeleteAsync("<partyId>", "<zoneId>");
             Console.WriteLine(response.Status);
@@ -255,10 +251,10 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -270,10 +266,10 @@ public void Example_GetCascadeDeleteJobDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCascadeDeleteJobDetails_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = client.GetCascadeDeleteJobDetails("<jobId>", new RequestContext());
+            Response response = client.GetCascadeDeleteJobDetails("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -294,10 +290,10 @@ public void Example_GetCascadeDeleteJobDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -309,10 +305,10 @@ public async Task Example_GetCascadeDeleteJobDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", new RequestContext());
+            Response response = await client.GetCascadeDeleteJobDetailsAsync("<jobId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
@@ -333,13 +329,13 @@ public async Task Example_GetCascadeDeleteJobDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetZonesByPartyId()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetZonesByPartyId("<partyId>", new string[] { "<types>" }, new string[] { "<managementZoneIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetZonesByPartyId("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -347,26 +343,47 @@ public void Example_GetZonesByPartyId()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetZonesByPartyId_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetZonesByPartyId("<partyId>", new string[] { "<types>" }, new string[] { "<managementZoneIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetZonesByPartyId("<partyId>", new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<managementZoneIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("managementZoneId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("managementZoneId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -374,13 +391,13 @@ public void Example_GetZonesByPartyId_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetZonesByPartyId_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetZonesByPartyIdAsync("<partyId>", new string[] { "<types>" }, new string[] { "<managementZoneIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetZonesByPartyIdAsync("<partyId>", null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -388,26 +405,47 @@ public async Task Example_GetZonesByPartyId_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetZonesByPartyId_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetZonesByPartyIdAsync("<partyId>", new string[] { "<types>" }, new string[] { "<managementZoneIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetZonesByPartyIdAsync("<partyId>", new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<managementZoneIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("managementZoneId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("managementZoneId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -415,13 +453,13 @@ public async Task Example_GetZonesByPartyId_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetZones()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetZones(new string[] { "<types>" }, new string[] { "<managementZoneIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetZones(null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -429,26 +467,47 @@ public void Example_GetZones()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetZones_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            foreach (var item in client.GetZones(new string[] { "<types>" }, new string[] { "<managementZoneIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetZones(new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<managementZoneIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("managementZoneId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("managementZoneId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -456,13 +515,13 @@ public void Example_GetZones_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetZones_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetZonesAsync(new string[] { "<types>" }, new string[] { "<managementZoneIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetZonesAsync(null, null, null, null, null, null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -470,26 +529,47 @@ public async Task Example_GetZones_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetZones_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
-            await foreach (var item in client.GetZonesAsync(new string[] { "<types>" }, new string[] { "<managementZoneIds>" }, new string[] { "<sources>" }, new string[] { "<ids>" }, new string[] { "<names>" }, new string[] { "<propertyFilters>" }, new string[] { "<statuses>" }, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, DateTimeOffset.UtcNow, 1234, "<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetZonesAsync(new List<string>()
+{
+"<types>"
+}, new List<string>()
+{
+"<managementZoneIds>"
+}, new List<string>()
+{
+"<sources>"
+}, new List<string>()
+{
+"<ids>"
+}, new List<string>()
+{
+"<names>"
+}, new List<string>()
+{
+"<propertyFilters>"
+}, new List<string>()
+{
+"<statuses>"
+}, DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), 1234, "<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("partyId").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("managementZoneId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("eTag").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("modifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("partyId").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("managementZoneId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("eTag").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("<key>").ToString());
             }
         }
 
@@ -497,12 +577,12 @@ public async Task Example_GetZones_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<zoneId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<zoneId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -513,12 +593,12 @@ public void Example_CreateCascadeDeleteJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateCascadeDeleteJob_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
-
-            var operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<zoneId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = client.CreateCascadeDeleteJob(WaitUntil.Completed, "<jobId>", "<partyId>", "<zoneId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -538,12 +618,12 @@ public void Example_CreateCascadeDeleteJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<zoneId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<zoneId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
@@ -554,12 +634,12 @@ public async Task Example_CreateCascadeDeleteJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateCascadeDeleteJob_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new FarmBeatsClient(credential).GetZonesClient("2022-11-01-preview");
-
-            var operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<zoneId>", new RequestContext());
+            TokenCredential credential = new DefaultAzureCredential();
+            Zones client = new FarmBeatsClient(credential).GetZonesClient(apiVersion: "2022-11-01-preview");
 
+            Operation<BinaryData> operation = await client.CreateCascadeDeleteJobAsync(WaitUntil.Completed, "<jobId>", "<partyId>", "<zoneId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("partyId").ToString());
             Console.WriteLine(result.GetProperty("resourceId").ToString());
diff --git a/sdk/anomalydetector/Azure.AI.AnomalyDetector/src/Generated/Docs/AnomalyDetectorClient.xml b/sdk/anomalydetector/Azure.AI.AnomalyDetector/src/Generated/Docs/AnomalyDetectorClient.xml
index 45719edd02b9..89fa85eb6721 100644
--- a/sdk/anomalydetector/Azure.AI.AnomalyDetector/src/Generated/Docs/AnomalyDetectorClient.xml
+++ b/sdk/anomalydetector/Azure.AI.AnomalyDetector/src/Generated/Docs/AnomalyDetectorClient.xml
@@ -2,22 +2,24 @@
 <doc>
   <members>
     <member name="DetectUnivariateEntireSeriesAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call DetectUnivariateEntireSeriesAsync with required request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    series = new[] {
-        new {
-            value = 123.45f,
-        }
-    },
-};
+      <example>
+This sample shows how to call DetectUnivariateEntireSeriesAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = await client.DetectUnivariateEntireSeriesAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["value"] = 123.45F,
+}
+},
+});
+Response response = await client.DetectUnivariateEntireSeriesAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("period").ToString());
@@ -28,29 +30,31 @@ Console.WriteLine(result.GetProperty("isAnomaly")[0].ToString());
 Console.WriteLine(result.GetProperty("isNegativeAnomaly")[0].ToString());
 Console.WriteLine(result.GetProperty("isPositiveAnomaly")[0].ToString());
 ]]></code>
-This sample shows how to call DetectUnivariateEntireSeriesAsync with all request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    series = new[] {
-        new {
-            timestamp = "2022-05-10T14:57:31.2311892-04:00",
-            value = 123.45f,
-        }
-    },
-    granularity = "yearly",
-    customInterval = 1234,
-    period = 1234,
-    maxAnomalyRatio = 123.45f,
-    sensitivity = 1234,
-    imputeMode = "auto",
-    imputeFixedValue = 123.45f,
-};
+This sample shows how to call DetectUnivariateEntireSeriesAsync with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = await client.DetectUnivariateEntireSeriesAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["timestamp"] = "2022-05-10T14:57:31.2311892-04:00",
+["value"] = 123.45F,
+}
+},
+    ["granularity"] = "yearly",
+    ["customInterval"] = 1234,
+    ["period"] = 1234,
+    ["maxAnomalyRatio"] = 123.45F,
+    ["sensitivity"] = 1234,
+    ["imputeMode"] = "auto",
+    ["imputeFixedValue"] = 123.45F,
+});
+Response response = await client.DetectUnivariateEntireSeriesAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("period").ToString());
@@ -61,26 +65,27 @@ Console.WriteLine(result.GetProperty("isAnomaly")[0].ToString());
 Console.WriteLine(result.GetProperty("isNegativeAnomaly")[0].ToString());
 Console.WriteLine(result.GetProperty("isPositiveAnomaly")[0].ToString());
 Console.WriteLine(result.GetProperty("severity")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DetectUnivariateEntireSeries(RequestContent,RequestContext)">
-<example>
-This sample shows how to call DetectUnivariateEntireSeries with required request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    series = new[] {
-        new {
-            value = 123.45f,
-        }
-    },
-};
+      <example>
+This sample shows how to call DetectUnivariateEntireSeries and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = client.DetectUnivariateEntireSeries(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["value"] = 123.45F,
+}
+},
+});
+Response response = client.DetectUnivariateEntireSeries(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("period").ToString());
@@ -91,29 +96,31 @@ Console.WriteLine(result.GetProperty("isAnomaly")[0].ToString());
 Console.WriteLine(result.GetProperty("isNegativeAnomaly")[0].ToString());
 Console.WriteLine(result.GetProperty("isPositiveAnomaly")[0].ToString());
 ]]></code>
-This sample shows how to call DetectUnivariateEntireSeries with all request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    series = new[] {
-        new {
-            timestamp = "2022-05-10T14:57:31.2311892-04:00",
-            value = 123.45f,
-        }
-    },
-    granularity = "yearly",
-    customInterval = 1234,
-    period = 1234,
-    maxAnomalyRatio = 123.45f,
-    sensitivity = 1234,
-    imputeMode = "auto",
-    imputeFixedValue = 123.45f,
-};
+This sample shows how to call DetectUnivariateEntireSeries with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = client.DetectUnivariateEntireSeries(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["timestamp"] = "2022-05-10T14:57:31.2311892-04:00",
+["value"] = 123.45F,
+}
+},
+    ["granularity"] = "yearly",
+    ["customInterval"] = 1234,
+    ["period"] = 1234,
+    ["maxAnomalyRatio"] = 123.45F,
+    ["sensitivity"] = 1234,
+    ["imputeMode"] = "auto",
+    ["imputeFixedValue"] = 123.45F,
+});
+Response response = client.DetectUnivariateEntireSeries(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("period").ToString());
@@ -124,82 +131,105 @@ Console.WriteLine(result.GetProperty("isAnomaly")[0].ToString());
 Console.WriteLine(result.GetProperty("isNegativeAnomaly")[0].ToString());
 Console.WriteLine(result.GetProperty("isPositiveAnomaly")[0].ToString());
 Console.WriteLine(result.GetProperty("severity")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DetectUnivariateLastPointAsync(UnivariateDetectionOptions,CancellationToken)">
-<example>
-This sample shows how to call DetectUnivariateLastPointAsync with required parameters.
+      <example>
+This sample shows how to call DetectUnivariateLastPointAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var options = new UnivariateDetectionOptions(new TimeSeriesPoint[] 
+UnivariateDetectionOptions options = new UnivariateDetectionOptions(new List<TimeSeriesPoint>()
 {
-    new TimeSeriesPoint(3.14f)
+new TimeSeriesPoint(123.45F)
+});
+Response<UnivariateLastDetectionResult> response = await client.DetectUnivariateLastPointAsync(options);
+]]></code>
+This sample shows how to call DetectUnivariateLastPointAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+UnivariateDetectionOptions options = new UnivariateDetectionOptions(new List<TimeSeriesPoint>()
 {
-        Timestamp = DateTimeOffset.UtcNow,
-    }
+new TimeSeriesPoint(123.45F)
+{
+Timestamp = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
 })
 {
     Granularity = TimeGranularity.Yearly,
     CustomInterval = 1234,
     Period = 1234,
-    MaxAnomalyRatio = 3.14f,
+    MaxAnomalyRatio = 123.45F,
     Sensitivity = 1234,
     ImputeMode = ImputeMode.Auto,
-    ImputeFixedValue = 3.14f,
+    ImputeFixedValue = 123.45F,
 };
-var result = await client.DetectUnivariateLastPointAsync(options);
-]]></code>
-</example>
+Response<UnivariateLastDetectionResult> response = await client.DetectUnivariateLastPointAsync(options);
+]]></code></example>
     </member>
     <member name="DetectUnivariateLastPoint(UnivariateDetectionOptions,CancellationToken)">
-<example>
-This sample shows how to call DetectUnivariateLastPoint with required parameters.
+      <example>
+This sample shows how to call DetectUnivariateLastPoint.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+UnivariateDetectionOptions options = new UnivariateDetectionOptions(new List<TimeSeriesPoint>()
+{
+new TimeSeriesPoint(123.45F)
+});
+Response<UnivariateLastDetectionResult> response = client.DetectUnivariateLastPoint(options);
+]]></code>
+This sample shows how to call DetectUnivariateLastPoint with all parameters.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var options = new UnivariateDetectionOptions(new TimeSeriesPoint[] 
+UnivariateDetectionOptions options = new UnivariateDetectionOptions(new List<TimeSeriesPoint>()
 {
-    new TimeSeriesPoint(3.14f)
+new TimeSeriesPoint(123.45F)
 {
-        Timestamp = DateTimeOffset.UtcNow,
-    }
+Timestamp = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
 })
 {
     Granularity = TimeGranularity.Yearly,
     CustomInterval = 1234,
     Period = 1234,
-    MaxAnomalyRatio = 3.14f,
+    MaxAnomalyRatio = 123.45F,
     Sensitivity = 1234,
     ImputeMode = ImputeMode.Auto,
-    ImputeFixedValue = 3.14f,
+    ImputeFixedValue = 123.45F,
 };
-var result = client.DetectUnivariateLastPoint(options);
-]]></code>
-</example>
+Response<UnivariateLastDetectionResult> response = client.DetectUnivariateLastPoint(options);
+]]></code></example>
     </member>
     <member name="DetectUnivariateLastPointAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call DetectUnivariateLastPointAsync with required request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    series = new[] {
-        new {
-            value = 123.45f,
-        }
-    },
-};
+      <example>
+This sample shows how to call DetectUnivariateLastPointAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = await client.DetectUnivariateLastPointAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["value"] = 123.45F,
+}
+},
+});
+Response response = await client.DetectUnivariateLastPointAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("period").ToString());
@@ -211,29 +241,31 @@ Console.WriteLine(result.GetProperty("isAnomaly").ToString());
 Console.WriteLine(result.GetProperty("isNegativeAnomaly").ToString());
 Console.WriteLine(result.GetProperty("isPositiveAnomaly").ToString());
 ]]></code>
-This sample shows how to call DetectUnivariateLastPointAsync with all request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    series = new[] {
-        new {
-            timestamp = "2022-05-10T14:57:31.2311892-04:00",
-            value = 123.45f,
-        }
-    },
-    granularity = "yearly",
-    customInterval = 1234,
-    period = 1234,
-    maxAnomalyRatio = 123.45f,
-    sensitivity = 1234,
-    imputeMode = "auto",
-    imputeFixedValue = 123.45f,
-};
+This sample shows how to call DetectUnivariateLastPointAsync with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = await client.DetectUnivariateLastPointAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["timestamp"] = "2022-05-10T14:57:31.2311892-04:00",
+["value"] = 123.45F,
+}
+},
+    ["granularity"] = "yearly",
+    ["customInterval"] = 1234,
+    ["period"] = 1234,
+    ["maxAnomalyRatio"] = 123.45F,
+    ["sensitivity"] = 1234,
+    ["imputeMode"] = "auto",
+    ["imputeFixedValue"] = 123.45F,
+});
+Response response = await client.DetectUnivariateLastPointAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("period").ToString());
@@ -245,26 +277,27 @@ Console.WriteLine(result.GetProperty("isAnomaly").ToString());
 Console.WriteLine(result.GetProperty("isNegativeAnomaly").ToString());
 Console.WriteLine(result.GetProperty("isPositiveAnomaly").ToString());
 Console.WriteLine(result.GetProperty("severity").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DetectUnivariateLastPoint(RequestContent,RequestContext)">
-<example>
-This sample shows how to call DetectUnivariateLastPoint with required request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    series = new[] {
-        new {
-            value = 123.45f,
-        }
-    },
-};
+      <example>
+This sample shows how to call DetectUnivariateLastPoint and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = client.DetectUnivariateLastPoint(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["value"] = 123.45F,
+}
+},
+});
+Response response = client.DetectUnivariateLastPoint(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("period").ToString());
@@ -276,29 +309,31 @@ Console.WriteLine(result.GetProperty("isAnomaly").ToString());
 Console.WriteLine(result.GetProperty("isNegativeAnomaly").ToString());
 Console.WriteLine(result.GetProperty("isPositiveAnomaly").ToString());
 ]]></code>
-This sample shows how to call DetectUnivariateLastPoint with all request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    series = new[] {
-        new {
-            timestamp = "2022-05-10T14:57:31.2311892-04:00",
-            value = 123.45f,
-        }
-    },
-    granularity = "yearly",
-    customInterval = 1234,
-    period = 1234,
-    maxAnomalyRatio = 123.45f,
-    sensitivity = 1234,
-    imputeMode = "auto",
-    imputeFixedValue = 123.45f,
-};
+This sample shows how to call DetectUnivariateLastPoint with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = client.DetectUnivariateLastPoint(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["timestamp"] = "2022-05-10T14:57:31.2311892-04:00",
+["value"] = 123.45F,
+}
+},
+    ["granularity"] = "yearly",
+    ["customInterval"] = 1234,
+    ["period"] = 1234,
+    ["maxAnomalyRatio"] = 123.45F,
+    ["sensitivity"] = 1234,
+    ["imputeMode"] = "auto",
+    ["imputeFixedValue"] = 123.45F,
+});
+Response response = client.DetectUnivariateLastPoint(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("period").ToString());
@@ -310,194 +345,251 @@ Console.WriteLine(result.GetProperty("isAnomaly").ToString());
 Console.WriteLine(result.GetProperty("isNegativeAnomaly").ToString());
 Console.WriteLine(result.GetProperty("isPositiveAnomaly").ToString());
 Console.WriteLine(result.GetProperty("severity").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DetectUnivariateChangePointAsync(UnivariateChangePointDetectionOptions,CancellationToken)">
-<example>
-This sample shows how to call DetectUnivariateChangePointAsync with required parameters.
+      <example>
+This sample shows how to call DetectUnivariateChangePointAsync.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+UnivariateChangePointDetectionOptions options = new UnivariateChangePointDetectionOptions(new List<TimeSeriesPoint>()
+{
+new TimeSeriesPoint(123.45F)
+}, TimeGranularity.Yearly);
+Response<UnivariateChangePointDetectionResult> response = await client.DetectUnivariateChangePointAsync(options);
+]]></code>
+This sample shows how to call DetectUnivariateChangePointAsync with all parameters.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var options = new UnivariateChangePointDetectionOptions(new TimeSeriesPoint[] 
+UnivariateChangePointDetectionOptions options = new UnivariateChangePointDetectionOptions(new List<TimeSeriesPoint>()
 {
-    new TimeSeriesPoint(3.14f)
+new TimeSeriesPoint(123.45F)
 {
-        Timestamp = DateTimeOffset.UtcNow,
-    }
+Timestamp = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
 }, TimeGranularity.Yearly)
 {
     CustomInterval = 1234,
     Period = 1234,
     StableTrendWindow = 1234,
-    Threshold = 3.14f,
+    Threshold = 123.45F,
 };
-var result = await client.DetectUnivariateChangePointAsync(options);
-]]></code>
-</example>
+Response<UnivariateChangePointDetectionResult> response = await client.DetectUnivariateChangePointAsync(options);
+]]></code></example>
     </member>
     <member name="DetectUnivariateChangePoint(UnivariateChangePointDetectionOptions,CancellationToken)">
-<example>
-This sample shows how to call DetectUnivariateChangePoint with required parameters.
+      <example>
+This sample shows how to call DetectUnivariateChangePoint.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+UnivariateChangePointDetectionOptions options = new UnivariateChangePointDetectionOptions(new List<TimeSeriesPoint>()
+{
+new TimeSeriesPoint(123.45F)
+}, TimeGranularity.Yearly);
+Response<UnivariateChangePointDetectionResult> response = client.DetectUnivariateChangePoint(options);
+]]></code>
+This sample shows how to call DetectUnivariateChangePoint with all parameters.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var options = new UnivariateChangePointDetectionOptions(new TimeSeriesPoint[] 
+UnivariateChangePointDetectionOptions options = new UnivariateChangePointDetectionOptions(new List<TimeSeriesPoint>()
 {
-    new TimeSeriesPoint(3.14f)
+new TimeSeriesPoint(123.45F)
 {
-        Timestamp = DateTimeOffset.UtcNow,
-    }
+Timestamp = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
 }, TimeGranularity.Yearly)
 {
     CustomInterval = 1234,
     Period = 1234,
     StableTrendWindow = 1234,
-    Threshold = 3.14f,
+    Threshold = 123.45F,
 };
-var result = client.DetectUnivariateChangePoint(options);
-]]></code>
-</example>
+Response<UnivariateChangePointDetectionResult> response = client.DetectUnivariateChangePoint(options);
+]]></code></example>
     </member>
     <member name="DetectUnivariateChangePointAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call DetectUnivariateChangePointAsync with required request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    series = new[] {
-        new {
-            value = 123.45f,
-        }
-    },
-    granularity = "yearly",
-};
+      <example>
+This sample shows how to call DetectUnivariateChangePointAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = await client.DetectUnivariateChangePointAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["value"] = 123.45F,
+}
+},
+    ["granularity"] = "yearly",
+});
+Response response = await client.DetectUnivariateChangePointAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call DetectUnivariateChangePointAsync with all request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    series = new[] {
-        new {
-            timestamp = "2022-05-10T14:57:31.2311892-04:00",
-            value = 123.45f,
-        }
-    },
-    granularity = "yearly",
-    customInterval = 1234,
-    period = 1234,
-    stableTrendWindow = 1234,
-    threshold = 123.45f,
-};
+This sample shows how to call DetectUnivariateChangePointAsync with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = await client.DetectUnivariateChangePointAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["timestamp"] = "2022-05-10T14:57:31.2311892-04:00",
+["value"] = 123.45F,
+}
+},
+    ["granularity"] = "yearly",
+    ["customInterval"] = 1234,
+    ["period"] = 1234,
+    ["stableTrendWindow"] = 1234,
+    ["threshold"] = 123.45F,
+});
+Response response = await client.DetectUnivariateChangePointAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("period").ToString());
 Console.WriteLine(result.GetProperty("isChangePoint")[0].ToString());
 Console.WriteLine(result.GetProperty("confidenceScores")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DetectUnivariateChangePoint(RequestContent,RequestContext)">
-<example>
-This sample shows how to call DetectUnivariateChangePoint with required request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    series = new[] {
-        new {
-            value = 123.45f,
-        }
-    },
-    granularity = "yearly",
-};
+      <example>
+This sample shows how to call DetectUnivariateChangePoint and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = client.DetectUnivariateChangePoint(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["value"] = 123.45F,
+}
+},
+    ["granularity"] = "yearly",
+});
+Response response = client.DetectUnivariateChangePoint(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call DetectUnivariateChangePoint with all request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    series = new[] {
-        new {
-            timestamp = "2022-05-10T14:57:31.2311892-04:00",
-            value = 123.45f,
-        }
-    },
-    granularity = "yearly",
-    customInterval = 1234,
-    period = 1234,
-    stableTrendWindow = 1234,
-    threshold = 123.45f,
-};
+This sample shows how to call DetectUnivariateChangePoint with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = client.DetectUnivariateChangePoint(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["timestamp"] = "2022-05-10T14:57:31.2311892-04:00",
+["value"] = 123.45F,
+}
+},
+    ["granularity"] = "yearly",
+    ["customInterval"] = 1234,
+    ["period"] = 1234,
+    ["stableTrendWindow"] = 1234,
+    ["threshold"] = 123.45F,
+});
+Response response = client.DetectUnivariateChangePoint(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("period").ToString());
 Console.WriteLine(result.GetProperty("isChangePoint")[0].ToString());
 Console.WriteLine(result.GetProperty("confidenceScores")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetMultivariateBatchDetectionResultAsync(Guid,CancellationToken)">
-<example>
-This sample shows how to call GetMultivariateBatchDetectionResultAsync with required parameters.
+      <example>
+This sample shows how to call GetMultivariateBatchDetectionResultAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var result = await client.GetMultivariateBatchDetectionResultAsync(Guid.NewGuid());
+Response<MultivariateDetectionResult> response = await client.GetMultivariateBatchDetectionResultAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
 ]]></code>
-</example>
+This sample shows how to call GetMultivariateBatchDetectionResultAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+Response<MultivariateDetectionResult> response = await client.GetMultivariateBatchDetectionResultAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
+]]></code></example>
     </member>
     <member name="GetMultivariateBatchDetectionResult(Guid,CancellationToken)">
-<example>
-This sample shows how to call GetMultivariateBatchDetectionResult with required parameters.
+      <example>
+This sample shows how to call GetMultivariateBatchDetectionResult.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var result = client.GetMultivariateBatchDetectionResult(Guid.NewGuid());
+Response<MultivariateDetectionResult> response = client.GetMultivariateBatchDetectionResult(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
 ]]></code>
-</example>
+This sample shows how to call GetMultivariateBatchDetectionResult with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+Response<MultivariateDetectionResult> response = client.GetMultivariateBatchDetectionResult(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
+]]></code></example>
     </member>
     <member name="GetMultivariateBatchDetectionResultAsync(Guid,RequestContext)">
-<example>
-This sample shows how to call GetMultivariateBatchDetectionResultAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMultivariateBatchDetectionResultAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = await client.GetMultivariateBatchDetectionResultAsync(Guid.NewGuid(), new RequestContext());
+Response response = await client.GetMultivariateBatchDetectionResultAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("resultId").ToString());
+Console.WriteLine(result.GetProperty("summary").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("summary").GetProperty("setupInfo").GetProperty("dataSource").ToString());
+Console.WriteLine(result.GetProperty("summary").GetProperty("setupInfo").GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("summary").GetProperty("setupInfo").GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("results")[0].GetProperty("timestamp").ToString());
+]]></code>
+This sample shows how to call GetMultivariateBatchDetectionResultAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+Response response = await client.GetMultivariateBatchDetectionResultAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("resultId").ToString());
@@ -522,18 +614,33 @@ Console.WriteLine(result.GetProperty("results")[0].GetProperty("value").GetPrope
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("value").GetProperty("interpretation")[0].GetProperty("correlationChanges").GetProperty("changedVariables")[0].ToString());
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("errors")[0].GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("errors")[0].GetProperty("message").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetMultivariateBatchDetectionResult(Guid,RequestContext)">
-<example>
-This sample shows how to call GetMultivariateBatchDetectionResult with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMultivariateBatchDetectionResult and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = client.GetMultivariateBatchDetectionResult(Guid.NewGuid(), new RequestContext());
+Response response = client.GetMultivariateBatchDetectionResult(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("resultId").ToString());
+Console.WriteLine(result.GetProperty("summary").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("summary").GetProperty("setupInfo").GetProperty("dataSource").ToString());
+Console.WriteLine(result.GetProperty("summary").GetProperty("setupInfo").GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("summary").GetProperty("setupInfo").GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("results")[0].GetProperty("timestamp").ToString());
+]]></code>
+This sample shows how to call GetMultivariateBatchDetectionResult with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+Response response = client.GetMultivariateBatchDetectionResult(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("resultId").ToString());
@@ -558,99 +665,115 @@ Console.WriteLine(result.GetProperty("results")[0].GetProperty("value").GetPrope
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("value").GetProperty("interpretation")[0].GetProperty("correlationChanges").GetProperty("changedVariables")[0].ToString());
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("errors")[0].GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("errors")[0].GetProperty("message").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="TrainMultivariateModelAsync(ModelInfo,CancellationToken)">
-<example>
-This sample shows how to call TrainMultivariateModelAsync with required parameters.
+      <example>
+This sample shows how to call TrainMultivariateModelAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var modelInfo = new ModelInfo(new Uri("http://localhost:3000"), DateTimeOffset.UtcNow, DateTimeOffset.UtcNow)
+ModelInfo modelInfo = new ModelInfo(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"));
+Response<AnomalyDetectionModel> response = await client.TrainMultivariateModelAsync(modelInfo);
+]]></code>
+This sample shows how to call TrainMultivariateModelAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+ModelInfo modelInfo = new ModelInfo(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"))
 {
     DataSchema = DataSchema.OneTable,
-    DisplayName = "<DisplayName>",
+    DisplayName = "<displayName>",
     SlidingWindow = 1234,
     AlignPolicy = new AlignPolicy()
-{
+    {
         AlignMode = AlignMode.Inner,
         FillNAMethod = FillNAMethod.Previous,
-        PaddingValue = 3.14f,
+        PaddingValue = 123.45F,
     },
 };
-var result = await client.TrainMultivariateModelAsync(modelInfo);
-]]></code>
-</example>
+Response<AnomalyDetectionModel> response = await client.TrainMultivariateModelAsync(modelInfo);
+]]></code></example>
     </member>
     <member name="TrainMultivariateModel(ModelInfo,CancellationToken)">
-<example>
-This sample shows how to call TrainMultivariateModel with required parameters.
+      <example>
+This sample shows how to call TrainMultivariateModel.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+ModelInfo modelInfo = new ModelInfo(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"));
+Response<AnomalyDetectionModel> response = client.TrainMultivariateModel(modelInfo);
+]]></code>
+This sample shows how to call TrainMultivariateModel with all parameters.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var modelInfo = new ModelInfo(new Uri("http://localhost:3000"), DateTimeOffset.UtcNow, DateTimeOffset.UtcNow)
+ModelInfo modelInfo = new ModelInfo(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"))
 {
     DataSchema = DataSchema.OneTable,
-    DisplayName = "<DisplayName>",
+    DisplayName = "<displayName>",
     SlidingWindow = 1234,
     AlignPolicy = new AlignPolicy()
-{
+    {
         AlignMode = AlignMode.Inner,
         FillNAMethod = FillNAMethod.Previous,
-        PaddingValue = 3.14f,
+        PaddingValue = 123.45F,
     },
 };
-var result = client.TrainMultivariateModel(modelInfo);
-]]></code>
-</example>
+Response<AnomalyDetectionModel> response = client.TrainMultivariateModel(modelInfo);
+]]></code></example>
     </member>
     <member name="TrainMultivariateModelAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call TrainMultivariateModelAsync with required request content, and how to parse the result.
+      <example>
+This sample shows how to call TrainMultivariateModelAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    dataSource = "http://localhost:3000",
-    startTime = "2022-05-10T14:57:31.2311892-04:00",
-    endTime = "2022-05-10T14:57:31.2311892-04:00",
-};
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = await client.TrainMultivariateModelAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["dataSource"] = "http://localhost:3000",
+    ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+    ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+});
+Response response = await client.TrainMultivariateModelAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("modelId").ToString());
 Console.WriteLine(result.GetProperty("createdTime").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedTime").ToString());
 ]]></code>
-This sample shows how to call TrainMultivariateModelAsync with all request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    dataSource = "http://localhost:3000",
-    dataSchema = "OneTable",
-    startTime = "2022-05-10T14:57:31.2311892-04:00",
-    endTime = "2022-05-10T14:57:31.2311892-04:00",
-    displayName = "<displayName>",
-    slidingWindow = 1234,
-    alignPolicy = new {
-        alignMode = "Inner",
-        fillNAMethod = "Previous",
-        paddingValue = 123.45f,
-    },
-};
+This sample shows how to call TrainMultivariateModelAsync with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = await client.TrainMultivariateModelAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["dataSource"] = "http://localhost:3000",
+    ["dataSchema"] = "OneTable",
+    ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+    ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+    ["displayName"] = "<displayName>",
+    ["slidingWindow"] = 1234,
+    ["alignPolicy"] = new Dictionary<string, object>()
+    {
+        ["alignMode"] = "Inner",
+        ["fillNAMethod"] = "Previous",
+        ["paddingValue"] = 123.45F,
+    },
+});
+Response response = await client.TrainMultivariateModelAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -677,51 +800,51 @@ Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo")
 Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("effectiveCount").ToString());
 Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("firstTimestamp").ToString());
 Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("lastTimestamp").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="TrainMultivariateModel(RequestContent,RequestContext)">
-<example>
-This sample shows how to call TrainMultivariateModel with required request content, and how to parse the result.
+      <example>
+This sample shows how to call TrainMultivariateModel and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    dataSource = "http://localhost:3000",
-    startTime = "2022-05-10T14:57:31.2311892-04:00",
-    endTime = "2022-05-10T14:57:31.2311892-04:00",
-};
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = client.TrainMultivariateModel(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["dataSource"] = "http://localhost:3000",
+    ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+    ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+});
+Response response = client.TrainMultivariateModel(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("modelId").ToString());
 Console.WriteLine(result.GetProperty("createdTime").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedTime").ToString());
 ]]></code>
-This sample shows how to call TrainMultivariateModel with all request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    dataSource = "http://localhost:3000",
-    dataSchema = "OneTable",
-    startTime = "2022-05-10T14:57:31.2311892-04:00",
-    endTime = "2022-05-10T14:57:31.2311892-04:00",
-    displayName = "<displayName>",
-    slidingWindow = 1234,
-    alignPolicy = new {
-        alignMode = "Inner",
-        fillNAMethod = "Previous",
-        paddingValue = 123.45f,
-    },
-};
+This sample shows how to call TrainMultivariateModel with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = client.TrainMultivariateModel(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["dataSource"] = "http://localhost:3000",
+    ["dataSchema"] = "OneTable",
+    ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+    ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+    ["displayName"] = "<displayName>",
+    ["slidingWindow"] = 1234,
+    ["alignPolicy"] = new Dictionary<string, object>()
+    {
+        ["alignMode"] = "Inner",
+        ["fillNAMethod"] = "Previous",
+        ["paddingValue"] = 123.45F,
+    },
+});
+Response response = client.TrainMultivariateModel(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -748,68 +871,110 @@ Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo")
 Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("effectiveCount").ToString());
 Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("firstTimestamp").ToString());
 Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("lastTimestamp").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteMultivariateModelAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteMultivariateModelAsync with required parameters.
+      <example>
+This sample shows how to call DeleteMultivariateModelAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
 Response response = await client.DeleteMultivariateModelAsync("<modelId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteMultivariateModelAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+Response response = await client.DeleteMultivariateModelAsync("<modelId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteMultivariateModel(string,RequestContext)">
-<example>
-This sample shows how to call DeleteMultivariateModel with required parameters.
+      <example>
+This sample shows how to call DeleteMultivariateModel.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
 Response response = client.DeleteMultivariateModel("<modelId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteMultivariateModel with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+Response response = client.DeleteMultivariateModel("<modelId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetMultivariateModelAsync(string,CancellationToken)">
-<example>
-This sample shows how to call GetMultivariateModelAsync with required parameters.
+      <example>
+This sample shows how to call GetMultivariateModelAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var result = await client.GetMultivariateModelAsync("<modelId>");
+Response<AnomalyDetectionModel> response = await client.GetMultivariateModelAsync("<modelId>");
 ]]></code>
-</example>
+This sample shows how to call GetMultivariateModelAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+Response<AnomalyDetectionModel> response = await client.GetMultivariateModelAsync("<modelId>");
+]]></code></example>
     </member>
     <member name="GetMultivariateModel(string,CancellationToken)">
-<example>
-This sample shows how to call GetMultivariateModel with required parameters.
+      <example>
+This sample shows how to call GetMultivariateModel.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var result = client.GetMultivariateModel("<modelId>");
+Response<AnomalyDetectionModel> response = client.GetMultivariateModel("<modelId>");
 ]]></code>
-</example>
+This sample shows how to call GetMultivariateModel with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+Response<AnomalyDetectionModel> response = client.GetMultivariateModel("<modelId>");
+]]></code></example>
     </member>
     <member name="GetMultivariateModelAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetMultivariateModelAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMultivariateModelAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+Response response = await client.GetMultivariateModelAsync("<modelId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("modelId").ToString());
+Console.WriteLine(result.GetProperty("createdTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedTime").ToString());
+]]></code>
+This sample shows how to call GetMultivariateModelAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = await client.GetMultivariateModelAsync("<modelId>", new RequestContext());
+Response response = await client.GetMultivariateModelAsync("<modelId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -836,18 +1001,30 @@ Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo")
 Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("effectiveCount").ToString());
 Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("firstTimestamp").ToString());
 Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("lastTimestamp").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetMultivariateModel(string,RequestContext)">
-<example>
-This sample shows how to call GetMultivariateModel with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMultivariateModel and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = client.GetMultivariateModel("<modelId>", new RequestContext());
+Response response = client.GetMultivariateModel("<modelId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("modelId").ToString());
+Console.WriteLine(result.GetProperty("createdTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedTime").ToString());
+]]></code>
+This sample shows how to call GetMultivariateModel with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+Response response = client.GetMultivariateModel("<modelId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -874,56 +1051,71 @@ Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo")
 Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("effectiveCount").ToString());
 Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("firstTimestamp").ToString());
 Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("lastTimestamp").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DetectMultivariateBatchAnomalyAsync(string,MultivariateBatchDetectionOptions,CancellationToken)">
-<example>
-This sample shows how to call DetectMultivariateBatchAnomalyAsync with required parameters.
+      <example>
+This sample shows how to call DetectMultivariateBatchAnomalyAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var options = new MultivariateBatchDetectionOptions(new Uri("http://localhost:3000"), DateTimeOffset.UtcNow, DateTimeOffset.UtcNow)
+MultivariateBatchDetectionOptions options = new MultivariateBatchDetectionOptions(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"));
+Response<MultivariateDetectionResult> response = await client.DetectMultivariateBatchAnomalyAsync("<modelId>", options);
+]]></code>
+This sample shows how to call DetectMultivariateBatchAnomalyAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+MultivariateBatchDetectionOptions options = new MultivariateBatchDetectionOptions(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"))
 {
     TopContributorCount = 1234,
 };
-var result = await client.DetectMultivariateBatchAnomalyAsync("<modelId>", options);
-]]></code>
-</example>
+Response<MultivariateDetectionResult> response = await client.DetectMultivariateBatchAnomalyAsync("<modelId>", options);
+]]></code></example>
     </member>
     <member name="DetectMultivariateBatchAnomaly(string,MultivariateBatchDetectionOptions,CancellationToken)">
-<example>
-This sample shows how to call DetectMultivariateBatchAnomaly with required parameters.
+      <example>
+This sample shows how to call DetectMultivariateBatchAnomaly.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var options = new MultivariateBatchDetectionOptions(new Uri("http://localhost:3000"), DateTimeOffset.UtcNow, DateTimeOffset.UtcNow)
+MultivariateBatchDetectionOptions options = new MultivariateBatchDetectionOptions(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"));
+Response<MultivariateDetectionResult> response = client.DetectMultivariateBatchAnomaly("<modelId>", options);
+]]></code>
+This sample shows how to call DetectMultivariateBatchAnomaly with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+MultivariateBatchDetectionOptions options = new MultivariateBatchDetectionOptions(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"))
 {
     TopContributorCount = 1234,
 };
-var result = client.DetectMultivariateBatchAnomaly("<modelId>", options);
-]]></code>
-</example>
+Response<MultivariateDetectionResult> response = client.DetectMultivariateBatchAnomaly("<modelId>", options);
+]]></code></example>
     </member>
     <member name="DetectMultivariateBatchAnomalyAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DetectMultivariateBatchAnomalyAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call DetectMultivariateBatchAnomalyAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var data = new {
-    dataSource = "http://localhost:3000",
-    startTime = "2022-05-10T14:57:31.2311892-04:00",
-    endTime = "2022-05-10T14:57:31.2311892-04:00",
-};
-
-Response response = await client.DetectMultivariateBatchAnomalyAsync("<modelId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["dataSource"] = "http://localhost:3000",
+    ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+    ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+});
+Response response = await client.DetectMultivariateBatchAnomalyAsync("<modelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("resultId").ToString());
@@ -933,20 +1125,20 @@ Console.WriteLine(result.GetProperty("summary").GetProperty("setupInfo").GetProp
 Console.WriteLine(result.GetProperty("summary").GetProperty("setupInfo").GetProperty("endTime").ToString());
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("timestamp").ToString());
 ]]></code>
-This sample shows how to call DetectMultivariateBatchAnomalyAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call DetectMultivariateBatchAnomalyAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    dataSource = "http://localhost:3000",
-    topContributorCount = 1234,
-    startTime = "2022-05-10T14:57:31.2311892-04:00",
-    endTime = "2022-05-10T14:57:31.2311892-04:00",
-};
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = await client.DetectMultivariateBatchAnomalyAsync("<modelId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["dataSource"] = "http://localhost:3000",
+    ["topContributorCount"] = 1234,
+    ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+    ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+});
+Response response = await client.DetectMultivariateBatchAnomalyAsync("<modelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("resultId").ToString());
@@ -971,24 +1163,23 @@ Console.WriteLine(result.GetProperty("results")[0].GetProperty("value").GetPrope
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("value").GetProperty("interpretation")[0].GetProperty("correlationChanges").GetProperty("changedVariables")[0].ToString());
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("errors")[0].GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("errors")[0].GetProperty("message").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DetectMultivariateBatchAnomaly(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DetectMultivariateBatchAnomaly with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call DetectMultivariateBatchAnomaly and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var data = new {
-    dataSource = "http://localhost:3000",
-    startTime = "2022-05-10T14:57:31.2311892-04:00",
-    endTime = "2022-05-10T14:57:31.2311892-04:00",
-};
-
-Response response = client.DetectMultivariateBatchAnomaly("<modelId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["dataSource"] = "http://localhost:3000",
+    ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+    ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+});
+Response response = client.DetectMultivariateBatchAnomaly("<modelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("resultId").ToString());
@@ -998,20 +1189,20 @@ Console.WriteLine(result.GetProperty("summary").GetProperty("setupInfo").GetProp
 Console.WriteLine(result.GetProperty("summary").GetProperty("setupInfo").GetProperty("endTime").ToString());
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("timestamp").ToString());
 ]]></code>
-This sample shows how to call DetectMultivariateBatchAnomaly with all parameters and request content, and how to parse the result.
+This sample shows how to call DetectMultivariateBatchAnomaly with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var data = new {
-    dataSource = "http://localhost:3000",
-    topContributorCount = 1234,
-    startTime = "2022-05-10T14:57:31.2311892-04:00",
-    endTime = "2022-05-10T14:57:31.2311892-04:00",
-};
-
-Response response = client.DetectMultivariateBatchAnomaly("<modelId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["dataSource"] = "http://localhost:3000",
+    ["topContributorCount"] = 1234,
+    ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+    ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+});
+Response response = client.DetectMultivariateBatchAnomaly("<modelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("resultId").ToString());
@@ -1036,108 +1227,149 @@ Console.WriteLine(result.GetProperty("results")[0].GetProperty("value").GetPrope
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("value").GetProperty("interpretation")[0].GetProperty("correlationChanges").GetProperty("changedVariables")[0].ToString());
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("errors")[0].GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("errors")[0].GetProperty("message").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DetectMultivariateLastAnomalyAsync(string,MultivariateLastDetectionOptions,CancellationToken)">
-<example>
-This sample shows how to call DetectMultivariateLastAnomalyAsync with required parameters.
+      <example>
+This sample shows how to call DetectMultivariateLastAnomalyAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var options = new MultivariateLastDetectionOptions(new VariableValues[] 
+MultivariateLastDetectionOptions options = new MultivariateLastDetectionOptions(new List<VariableValues>()
 {
-    new VariableValues("<variable>", new string[] 
+new VariableValues("<variable>",new List<string>()
 {
-        "<null>"
-    }, new float[] 
+"<timestamps>"
+},new List<float>()
 {
-        3.14f
-    })
+123.45F
+})
+});
+Response<MultivariateLastDetectionResult> response = await client.DetectMultivariateLastAnomalyAsync("<modelId>", options);
+]]></code>
+This sample shows how to call DetectMultivariateLastAnomalyAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+MultivariateLastDetectionOptions options = new MultivariateLastDetectionOptions(new List<VariableValues>()
+{
+new VariableValues("<variable>",new List<string>()
+{
+"<timestamps>"
+},new List<float>()
+{
+123.45F
+})
 })
 {
     TopContributorCount = 1234,
 };
-var result = await client.DetectMultivariateLastAnomalyAsync("<modelId>", options);
-]]></code>
-</example>
+Response<MultivariateLastDetectionResult> response = await client.DetectMultivariateLastAnomalyAsync("<modelId>", options);
+]]></code></example>
     </member>
     <member name="DetectMultivariateLastAnomaly(string,MultivariateLastDetectionOptions,CancellationToken)">
-<example>
-This sample shows how to call DetectMultivariateLastAnomaly with required parameters.
+      <example>
+This sample shows how to call DetectMultivariateLastAnomaly.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-var options = new MultivariateLastDetectionOptions(new VariableValues[] 
+MultivariateLastDetectionOptions options = new MultivariateLastDetectionOptions(new List<VariableValues>()
 {
-    new VariableValues("<variable>", new string[] 
+new VariableValues("<variable>",new List<string>()
 {
-        "<null>"
-    }, new float[] 
+"<timestamps>"
+},new List<float>()
 {
-        3.14f
-    })
+123.45F
+})
+});
+Response<MultivariateLastDetectionResult> response = client.DetectMultivariateLastAnomaly("<modelId>", options);
+]]></code>
+This sample shows how to call DetectMultivariateLastAnomaly with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+MultivariateLastDetectionOptions options = new MultivariateLastDetectionOptions(new List<VariableValues>()
+{
+new VariableValues("<variable>",new List<string>()
+{
+"<timestamps>"
+},new List<float>()
+{
+123.45F
+})
 })
 {
     TopContributorCount = 1234,
 };
-var result = client.DetectMultivariateLastAnomaly("<modelId>", options);
-]]></code>
-</example>
+Response<MultivariateLastDetectionResult> response = client.DetectMultivariateLastAnomaly("<modelId>", options);
+]]></code></example>
     </member>
     <member name="DetectMultivariateLastAnomalyAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DetectMultivariateLastAnomalyAsync with required parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    variables = new[] {
-        new {
-            variable = "<variable>",
-            timestamps = new[] {
-                "<String>"
-            },
-            values = new[] {
-                123.45f
-            },
-        }
-    },
-};
+      <example>
+This sample shows how to call DetectMultivariateLastAnomalyAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = await client.DetectMultivariateLastAnomalyAsync("<modelId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["variables"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["variable"] = "<variable>",
+["timestamps"] = new List<object>()
+{
+"<timestamps>"
+},
+["values"] = new List<object>()
+{
+123.45F
+},
+}
+},
+});
+Response response = await client.DetectMultivariateLastAnomalyAsync("<modelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call DetectMultivariateLastAnomalyAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    variables = new[] {
-        new {
-            variable = "<variable>",
-            timestamps = new[] {
-                "<String>"
-            },
-            values = new[] {
-                123.45f
-            },
-        }
-    },
-    topContributorCount = 1234,
-};
+This sample shows how to call DetectMultivariateLastAnomalyAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = await client.DetectMultivariateLastAnomalyAsync("<modelId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["variables"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["variable"] = "<variable>",
+["timestamps"] = new List<object>()
+{
+"<timestamps>"
+},
+["values"] = new List<object>()
+{
+123.45F
+},
+}
+},
+    ["topContributorCount"] = 1234,
+});
+Response response = await client.DetectMultivariateLastAnomalyAsync("<modelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("variableStates")[0].GetProperty("variable").ToString());
@@ -1154,58 +1386,65 @@ Console.WriteLine(result.GetProperty("results")[0].GetProperty("value").GetPrope
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("value").GetProperty("interpretation")[0].GetProperty("correlationChanges").GetProperty("changedVariables")[0].ToString());
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("errors")[0].GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("errors")[0].GetProperty("message").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DetectMultivariateLastAnomaly(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DetectMultivariateLastAnomaly with required parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    variables = new[] {
-        new {
-            variable = "<variable>",
-            timestamps = new[] {
-                "<String>"
-            },
-            values = new[] {
-                123.45f
-            },
-        }
-    },
-};
+      <example>
+This sample shows how to call DetectMultivariateLastAnomaly and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = client.DetectMultivariateLastAnomaly("<modelId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["variables"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["variable"] = "<variable>",
+["timestamps"] = new List<object>()
+{
+"<timestamps>"
+},
+["values"] = new List<object>()
+{
+123.45F
+},
+}
+},
+});
+Response response = client.DetectMultivariateLastAnomaly("<modelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call DetectMultivariateLastAnomaly with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
-
-var data = new {
-    variables = new[] {
-        new {
-            variable = "<variable>",
-            timestamps = new[] {
-                "<String>"
-            },
-            values = new[] {
-                123.45f
-            },
-        }
-    },
-    topContributorCount = 1234,
-};
+This sample shows how to call DetectMultivariateLastAnomaly with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-Response response = client.DetectMultivariateLastAnomaly("<modelId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["variables"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["variable"] = "<variable>",
+["timestamps"] = new List<object>()
+{
+"<timestamps>"
+},
+["values"] = new List<object>()
+{
+123.45F
+},
+}
+},
+    ["topContributorCount"] = 1234,
+});
+Response response = client.DetectMultivariateLastAnomaly("<modelId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("variableStates")[0].GetProperty("variable").ToString());
@@ -1222,114 +1461,157 @@ Console.WriteLine(result.GetProperty("results")[0].GetProperty("value").GetPrope
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("value").GetProperty("interpretation")[0].GetProperty("correlationChanges").GetProperty("changedVariables")[0].ToString());
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("errors")[0].GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("results")[0].GetProperty("errors")[0].GetProperty("message").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetMultivariateModelsAsync(int?,int?,CancellationToken)">
-<example>
-This sample shows how to call GetMultivariateModelsAsync with required parameters.
+      <example>
+This sample shows how to call GetMultivariateModelsAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-await foreach (var item in client.GetMultivariateModelsAsync(1234, 1234))
+await foreach (AnomalyDetectionModel item in client.GetMultivariateModelsAsync())
 {
 }
 ]]></code>
-</example>
+This sample shows how to call GetMultivariateModelsAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+await foreach (AnomalyDetectionModel item in client.GetMultivariateModelsAsync(skip: 1234, maxCount: 1234))
+{
+}
+]]></code></example>
     </member>
     <member name="GetMultivariateModels(int?,int?,CancellationToken)">
-<example>
-This sample shows how to call GetMultivariateModels with required parameters.
+      <example>
+This sample shows how to call GetMultivariateModels.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-foreach (var item in client.GetMultivariateModels(1234, 1234))
+foreach (AnomalyDetectionModel item in client.GetMultivariateModels())
 {
 }
 ]]></code>
-</example>
+This sample shows how to call GetMultivariateModels with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+foreach (AnomalyDetectionModel item in client.GetMultivariateModels(skip: 1234, maxCount: 1234))
+{
+}
+]]></code></example>
     </member>
     <member name="GetMultivariateModelsAsync(int?,int?,RequestContext)">
-<example>
-This sample shows how to call GetMultivariateModelsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMultivariateModelsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-await foreach (var item in client.GetMultivariateModelsAsync(1234, 1234, new RequestContext()))
+await foreach (BinaryData item in client.GetMultivariateModelsAsync(null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("modelId").ToString());
-    Console.WriteLine(result.GetProperty("createdTime").ToString());
-    Console.WriteLine(result.GetProperty("lastUpdatedTime").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("dataSource").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("dataSchema").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("startTime").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("endTime").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("displayName").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("slidingWindow").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("alignMode").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("fillNAMethod").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("paddingValue").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("epochIds")[0].ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("trainLosses")[0].ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("validationLosses")[0].ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("latenciesInSeconds")[0].ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("variable").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("filledNARatio").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("effectiveCount").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("firstTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("lastTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastUpdatedTime").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetMultivariateModelsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetMultivariateModelsAsync(1234, 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastUpdatedTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("dataSource").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("dataSchema").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("endTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("displayName").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("slidingWindow").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("alignMode").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("fillNAMethod").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("paddingValue").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("epochIds")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("trainLosses")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("validationLosses")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("latenciesInSeconds")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("variable").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("filledNARatio").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("effectiveCount").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("firstTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("lastTimestamp").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetMultivariateModels(int?,int?,RequestContext)">
-<example>
-This sample shows how to call GetMultivariateModels with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMultivariateModels and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new AnomalyDetectorClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-foreach (var item in client.GetMultivariateModels(1234, 1234, new RequestContext()))
+foreach (BinaryData item in client.GetMultivariateModels(null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("modelId").ToString());
-    Console.WriteLine(result.GetProperty("createdTime").ToString());
-    Console.WriteLine(result.GetProperty("lastUpdatedTime").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("dataSource").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("dataSchema").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("startTime").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("endTime").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("displayName").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("slidingWindow").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("alignMode").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("fillNAMethod").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("paddingValue").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("epochIds")[0].ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("trainLosses")[0].ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("validationLosses")[0].ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("latenciesInSeconds")[0].ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("variable").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("filledNARatio").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("effectiveCount").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("firstTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("lastTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastUpdatedTime").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetMultivariateModels with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetMultivariateModels(1234, 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastUpdatedTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("dataSource").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("dataSchema").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("endTime").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("displayName").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("slidingWindow").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("alignMode").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("fillNAMethod").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("paddingValue").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("epochIds")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("trainLosses")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("validationLosses")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("latenciesInSeconds")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("variable").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("filledNARatio").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("effectiveCount").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("firstTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("lastTimestamp").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/anomalydetector/Azure.AI.AnomalyDetector/tests/Generated/Samples/Samples_AnomalyDetectorClient.cs b/sdk/anomalydetector/Azure.AI.AnomalyDetector/tests/Generated/Samples/Samples_AnomalyDetectorClient.cs
index 089576b3804e..414fdc416b19 100644
--- a/sdk/anomalydetector/Azure.AI.AnomalyDetector/tests/Generated/Samples/Samples_AnomalyDetectorClient.cs
+++ b/sdk/anomalydetector/Azure.AI.AnomalyDetector/tests/Generated/Samples/Samples_AnomalyDetectorClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.AI.AnomalyDetector;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,20 +23,21 @@ public class Samples_AnomalyDetectorClient
         [Ignore("Only validating compilation of examples")]
         public void Example_DetectUnivariateEntireSeries()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                series = new[] {
-        new {
-            value = 123.45f,
-        }
-    },
-            };
-
-            Response response = client.DetectUnivariateEntireSeries(RequestContent.Create(data));
+                ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["value"] = 123.45F,
+}
+},
+            });
+            Response response = client.DetectUnivariateEntireSeries(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("period").ToString());
@@ -52,28 +53,29 @@ public void Example_DetectUnivariateEntireSeries()
         [Ignore("Only validating compilation of examples")]
         public void Example_DetectUnivariateEntireSeries_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                series = new[] {
-        new {
-            timestamp = "2022-05-10T14:57:31.2311892-04:00",
-            value = 123.45f,
-        }
-    },
-                granularity = "yearly",
-                customInterval = 1234,
-                period = 1234,
-                maxAnomalyRatio = 123.45f,
-                sensitivity = 1234,
-                imputeMode = "auto",
-                imputeFixedValue = 123.45f,
-            };
-
-            Response response = client.DetectUnivariateEntireSeries(RequestContent.Create(data));
+                ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["timestamp"] = "2022-05-10T14:57:31.2311892-04:00",
+["value"] = 123.45F,
+}
+},
+                ["granularity"] = "yearly",
+                ["customInterval"] = 1234,
+                ["period"] = 1234,
+                ["maxAnomalyRatio"] = 123.45F,
+                ["sensitivity"] = 1234,
+                ["imputeMode"] = "auto",
+                ["imputeFixedValue"] = 123.45F,
+            });
+            Response response = client.DetectUnivariateEntireSeries(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("period").ToString());
@@ -90,20 +92,21 @@ public void Example_DetectUnivariateEntireSeries_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DetectUnivariateEntireSeries_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                series = new[] {
-        new {
-            value = 123.45f,
-        }
-    },
-            };
-
-            Response response = await client.DetectUnivariateEntireSeriesAsync(RequestContent.Create(data));
+                ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["value"] = 123.45F,
+}
+},
+            });
+            Response response = await client.DetectUnivariateEntireSeriesAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("period").ToString());
@@ -119,28 +122,29 @@ public async Task Example_DetectUnivariateEntireSeries_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DetectUnivariateEntireSeries_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                series = new[] {
-        new {
-            timestamp = "2022-05-10T14:57:31.2311892-04:00",
-            value = 123.45f,
-        }
-    },
-                granularity = "yearly",
-                customInterval = 1234,
-                period = 1234,
-                maxAnomalyRatio = 123.45f,
-                sensitivity = 1234,
-                imputeMode = "auto",
-                imputeFixedValue = 123.45f,
-            };
-
-            Response response = await client.DetectUnivariateEntireSeriesAsync(RequestContent.Create(data));
+                ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["timestamp"] = "2022-05-10T14:57:31.2311892-04:00",
+["value"] = 123.45F,
+}
+},
+                ["granularity"] = "yearly",
+                ["customInterval"] = 1234,
+                ["period"] = 1234,
+                ["maxAnomalyRatio"] = 123.45F,
+                ["sensitivity"] = 1234,
+                ["imputeMode"] = "auto",
+                ["imputeFixedValue"] = 123.45F,
+            });
+            Response response = await client.DetectUnivariateEntireSeriesAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("period").ToString());
@@ -157,20 +161,21 @@ public async Task Example_DetectUnivariateEntireSeries_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DetectUnivariateLastPoint()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                series = new[] {
-        new {
-            value = 123.45f,
-        }
-    },
-            };
-
-            Response response = client.DetectUnivariateLastPoint(RequestContent.Create(data));
+                ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["value"] = 123.45F,
+}
+},
+            });
+            Response response = client.DetectUnivariateLastPoint(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("period").ToString());
@@ -187,28 +192,29 @@ public void Example_DetectUnivariateLastPoint()
         [Ignore("Only validating compilation of examples")]
         public void Example_DetectUnivariateLastPoint_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                series = new[] {
-        new {
-            timestamp = "2022-05-10T14:57:31.2311892-04:00",
-            value = 123.45f,
-        }
-    },
-                granularity = "yearly",
-                customInterval = 1234,
-                period = 1234,
-                maxAnomalyRatio = 123.45f,
-                sensitivity = 1234,
-                imputeMode = "auto",
-                imputeFixedValue = 123.45f,
-            };
-
-            Response response = client.DetectUnivariateLastPoint(RequestContent.Create(data));
+                ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["timestamp"] = "2022-05-10T14:57:31.2311892-04:00",
+["value"] = 123.45F,
+}
+},
+                ["granularity"] = "yearly",
+                ["customInterval"] = 1234,
+                ["period"] = 1234,
+                ["maxAnomalyRatio"] = 123.45F,
+                ["sensitivity"] = 1234,
+                ["imputeMode"] = "auto",
+                ["imputeFixedValue"] = 123.45F,
+            });
+            Response response = client.DetectUnivariateLastPoint(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("period").ToString());
@@ -224,22 +230,65 @@ public void Example_DetectUnivariateLastPoint_AllParameters()
 
         [Test]
         [Ignore("Only validating compilation of examples")]
-        public async Task Example_DetectUnivariateLastPoint_Async()
+        public void Example_DetectUnivariateLastPoint_Convenience()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
-            {
-                series = new[] {
-        new {
-            value = 123.45f,
+            UnivariateDetectionOptions options = new UnivariateDetectionOptions(new List<TimeSeriesPoint>()
+{
+new TimeSeriesPoint(123.45F)
+});
+            Response<UnivariateLastDetectionResult> response = client.DetectUnivariateLastPoint(options);
         }
-    },
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_DetectUnivariateLastPoint_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            UnivariateDetectionOptions options = new UnivariateDetectionOptions(new List<TimeSeriesPoint>()
+{
+new TimeSeriesPoint(123.45F)
+{
+Timestamp = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
+})
+            {
+                Granularity = TimeGranularity.Yearly,
+                CustomInterval = 1234,
+                Period = 1234,
+                MaxAnomalyRatio = 123.45F,
+                Sensitivity = 1234,
+                ImputeMode = ImputeMode.Auto,
+                ImputeFixedValue = 123.45F,
             };
+            Response<UnivariateLastDetectionResult> response = client.DetectUnivariateLastPoint(options);
+        }
 
-            Response response = await client.DetectUnivariateLastPointAsync(RequestContent.Create(data));
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_DetectUnivariateLastPoint_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+            {
+                ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["value"] = 123.45F,
+}
+},
+            });
+            Response response = await client.DetectUnivariateLastPointAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("period").ToString());
@@ -256,28 +305,29 @@ public async Task Example_DetectUnivariateLastPoint_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DetectUnivariateLastPoint_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                series = new[] {
-        new {
-            timestamp = "2022-05-10T14:57:31.2311892-04:00",
-            value = 123.45f,
-        }
-    },
-                granularity = "yearly",
-                customInterval = 1234,
-                period = 1234,
-                maxAnomalyRatio = 123.45f,
-                sensitivity = 1234,
-                imputeMode = "auto",
-                imputeFixedValue = 123.45f,
-            };
-
-            Response response = await client.DetectUnivariateLastPointAsync(RequestContent.Create(data));
+                ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["timestamp"] = "2022-05-10T14:57:31.2311892-04:00",
+["value"] = 123.45F,
+}
+},
+                ["granularity"] = "yearly",
+                ["customInterval"] = 1234,
+                ["period"] = 1234,
+                ["maxAnomalyRatio"] = 123.45F,
+                ["sensitivity"] = 1234,
+                ["imputeMode"] = "auto",
+                ["imputeFixedValue"] = 123.45F,
+            });
+            Response response = await client.DetectUnivariateLastPointAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("period").ToString());
@@ -295,48 +345,64 @@ public async Task Example_DetectUnivariateLastPoint_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DetectUnivariateLastPoint_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var options = new UnivariateDetectionOptions(new TimeSeriesPoint[]
-            {
-    new TimeSeriesPoint(3.14f)
+            UnivariateDetectionOptions options = new UnivariateDetectionOptions(new List<TimeSeriesPoint>()
 {
-        Timestamp = DateTimeOffset.UtcNow,
-    }
-            })
+new TimeSeriesPoint(123.45F)
+});
+            Response<UnivariateLastDetectionResult> response = await client.DetectUnivariateLastPointAsync(options);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_DetectUnivariateLastPoint_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            UnivariateDetectionOptions options = new UnivariateDetectionOptions(new List<TimeSeriesPoint>()
+{
+new TimeSeriesPoint(123.45F)
+{
+Timestamp = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
+})
             {
                 Granularity = TimeGranularity.Yearly,
                 CustomInterval = 1234,
                 Period = 1234,
-                MaxAnomalyRatio = 3.14f,
+                MaxAnomalyRatio = 123.45F,
                 Sensitivity = 1234,
                 ImputeMode = ImputeMode.Auto,
-                ImputeFixedValue = 3.14f,
+                ImputeFixedValue = 123.45F,
             };
-            var result = await client.DetectUnivariateLastPointAsync(options);
+            Response<UnivariateLastDetectionResult> response = await client.DetectUnivariateLastPointAsync(options);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_DetectUnivariateChangePoint()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                series = new[] {
-        new {
-            value = 123.45f,
-        }
-    },
-                granularity = "yearly",
-            };
-
-            Response response = client.DetectUnivariateChangePoint(RequestContent.Create(data));
+                ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["value"] = 123.45F,
+}
+},
+                ["granularity"] = "yearly",
+            });
+            Response response = client.DetectUnivariateChangePoint(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -346,26 +412,27 @@ public void Example_DetectUnivariateChangePoint()
         [Ignore("Only validating compilation of examples")]
         public void Example_DetectUnivariateChangePoint_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                series = new[] {
-        new {
-            timestamp = "2022-05-10T14:57:31.2311892-04:00",
-            value = 123.45f,
-        }
-    },
-                granularity = "yearly",
-                customInterval = 1234,
-                period = 1234,
-                stableTrendWindow = 1234,
-                threshold = 123.45f,
-            };
-
-            Response response = client.DetectUnivariateChangePoint(RequestContent.Create(data));
+                ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["timestamp"] = "2022-05-10T14:57:31.2311892-04:00",
+["value"] = 123.45F,
+}
+},
+                ["granularity"] = "yearly",
+                ["customInterval"] = 1234,
+                ["period"] = 1234,
+                ["stableTrendWindow"] = 1234,
+                ["threshold"] = 123.45F,
+            });
+            Response response = client.DetectUnivariateChangePoint(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("period").ToString());
@@ -375,23 +442,63 @@ public void Example_DetectUnivariateChangePoint_AllParameters()
 
         [Test]
         [Ignore("Only validating compilation of examples")]
-        public async Task Example_DetectUnivariateChangePoint_Async()
+        public void Example_DetectUnivariateChangePoint_Convenience()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
-            {
-                series = new[] {
-        new {
-            value = 123.45f,
+            UnivariateChangePointDetectionOptions options = new UnivariateChangePointDetectionOptions(new List<TimeSeriesPoint>()
+{
+new TimeSeriesPoint(123.45F)
+}, TimeGranularity.Yearly);
+            Response<UnivariateChangePointDetectionResult> response = client.DetectUnivariateChangePoint(options);
         }
-    },
-                granularity = "yearly",
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_DetectUnivariateChangePoint_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            UnivariateChangePointDetectionOptions options = new UnivariateChangePointDetectionOptions(new List<TimeSeriesPoint>()
+{
+new TimeSeriesPoint(123.45F)
+{
+Timestamp = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
+}, TimeGranularity.Yearly)
+            {
+                CustomInterval = 1234,
+                Period = 1234,
+                StableTrendWindow = 1234,
+                Threshold = 123.45F,
             };
+            Response<UnivariateChangePointDetectionResult> response = client.DetectUnivariateChangePoint(options);
+        }
 
-            Response response = await client.DetectUnivariateChangePointAsync(RequestContent.Create(data));
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_DetectUnivariateChangePoint_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+            {
+                ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["value"] = 123.45F,
+}
+},
+                ["granularity"] = "yearly",
+            });
+            Response response = await client.DetectUnivariateChangePointAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -401,26 +508,27 @@ public async Task Example_DetectUnivariateChangePoint_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DetectUnivariateChangePoint_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                series = new[] {
-        new {
-            timestamp = "2022-05-10T14:57:31.2311892-04:00",
-            value = 123.45f,
-        }
-    },
-                granularity = "yearly",
-                customInterval = 1234,
-                period = 1234,
-                stableTrendWindow = 1234,
-                threshold = 123.45f,
-            };
-
-            Response response = await client.DetectUnivariateChangePointAsync(RequestContent.Create(data));
+                ["series"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["timestamp"] = "2022-05-10T14:57:31.2311892-04:00",
+["value"] = 123.45F,
+}
+},
+                ["granularity"] = "yearly",
+                ["customInterval"] = 1234,
+                ["period"] = 1234,
+                ["stableTrendWindow"] = 1234,
+                ["threshold"] = 123.45F,
+            });
+            Response response = await client.DetectUnivariateChangePointAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("period").ToString());
@@ -432,35 +540,50 @@ public async Task Example_DetectUnivariateChangePoint_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DetectUnivariateChangePoint_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var options = new UnivariateChangePointDetectionOptions(new TimeSeriesPoint[]
-            {
-    new TimeSeriesPoint(3.14f)
+            UnivariateChangePointDetectionOptions options = new UnivariateChangePointDetectionOptions(new List<TimeSeriesPoint>()
 {
-        Timestamp = DateTimeOffset.UtcNow,
-    }
-            }, TimeGranularity.Yearly)
+new TimeSeriesPoint(123.45F)
+}, TimeGranularity.Yearly);
+            Response<UnivariateChangePointDetectionResult> response = await client.DetectUnivariateChangePointAsync(options);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_DetectUnivariateChangePoint_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            UnivariateChangePointDetectionOptions options = new UnivariateChangePointDetectionOptions(new List<TimeSeriesPoint>()
+{
+new TimeSeriesPoint(123.45F)
+{
+Timestamp = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
+}, TimeGranularity.Yearly)
             {
                 CustomInterval = 1234,
                 Period = 1234,
                 StableTrendWindow = 1234,
-                Threshold = 3.14f,
+                Threshold = 123.45F,
             };
-            var result = await client.DetectUnivariateChangePointAsync(options);
+            Response<UnivariateChangePointDetectionResult> response = await client.DetectUnivariateChangePointAsync(options);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMultivariateBatchDetectionResult()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            Response response = client.GetMultivariateBatchDetectionResult(Guid.NewGuid(), new RequestContext());
+            Response response = client.GetMultivariateBatchDetectionResult(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("resultId").ToString());
@@ -475,11 +598,11 @@ public void Example_GetMultivariateBatchDetectionResult()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMultivariateBatchDetectionResult_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            Response response = client.GetMultivariateBatchDetectionResult(Guid.NewGuid(), new RequestContext());
+            Response response = client.GetMultivariateBatchDetectionResult(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("resultId").ToString());
@@ -506,15 +629,37 @@ public void Example_GetMultivariateBatchDetectionResult_AllParameters()
             Console.WriteLine(result.GetProperty("results")[0].GetProperty("errors")[0].GetProperty("message").ToString());
         }
 
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_GetMultivariateBatchDetectionResult_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            Response<MultivariateDetectionResult> response = client.GetMultivariateBatchDetectionResult(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_GetMultivariateBatchDetectionResult_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            Response<MultivariateDetectionResult> response = client.GetMultivariateBatchDetectionResult(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
+        }
+
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMultivariateBatchDetectionResult_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            Response response = await client.GetMultivariateBatchDetectionResultAsync(Guid.NewGuid(), new RequestContext());
+            Response response = await client.GetMultivariateBatchDetectionResultAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("resultId").ToString());
@@ -529,11 +674,11 @@ public async Task Example_GetMultivariateBatchDetectionResult_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMultivariateBatchDetectionResult_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            Response response = await client.GetMultivariateBatchDetectionResultAsync(Guid.NewGuid(), new RequestContext());
+            Response response = await client.GetMultivariateBatchDetectionResultAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("resultId").ToString());
@@ -564,29 +709,39 @@ public async Task Example_GetMultivariateBatchDetectionResult_AllParameters_Asyn
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMultivariateBatchDetectionResult_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var result = await client.GetMultivariateBatchDetectionResultAsync(Guid.NewGuid());
+            Response<MultivariateDetectionResult> response = await client.GetMultivariateBatchDetectionResultAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_GetMultivariateBatchDetectionResult_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            Response<MultivariateDetectionResult> response = await client.GetMultivariateBatchDetectionResultAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_TrainMultivariateModel()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                dataSource = "http://localhost:3000",
-                startTime = "2022-05-10T14:57:31.2311892-04:00",
-                endTime = "2022-05-10T14:57:31.2311892-04:00",
-            };
-
-            Response response = client.TrainMultivariateModel(RequestContent.Create(data));
+                ["dataSource"] = "http://localhost:3000",
+                ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+                ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+            });
+            Response response = client.TrainMultivariateModel(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -598,27 +753,26 @@ public void Example_TrainMultivariateModel()
         [Ignore("Only validating compilation of examples")]
         public void Example_TrainMultivariateModel_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                dataSource = "http://localhost:3000",
-                dataSchema = "OneTable",
-                startTime = "2022-05-10T14:57:31.2311892-04:00",
-                endTime = "2022-05-10T14:57:31.2311892-04:00",
-                displayName = "<displayName>",
-                slidingWindow = 1234,
-                alignPolicy = new
+                ["dataSource"] = "http://localhost:3000",
+                ["dataSchema"] = "OneTable",
+                ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+                ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+                ["displayName"] = "<displayName>",
+                ["slidingWindow"] = 1234,
+                ["alignPolicy"] = new Dictionary<string, object>()
                 {
-                    alignMode = "Inner",
-                    fillNAMethod = "Previous",
-                    paddingValue = 123.45f,
+                    ["alignMode"] = "Inner",
+                    ["fillNAMethod"] = "Previous",
+                    ["paddingValue"] = 123.45F,
                 },
-            };
-
-            Response response = client.TrainMultivariateModel(RequestContent.Create(data));
+            });
+            Response response = client.TrainMultivariateModel(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -649,20 +803,54 @@ public void Example_TrainMultivariateModel_AllParameters()
 
         [Test]
         [Ignore("Only validating compilation of examples")]
-        public async Task Example_TrainMultivariateModel_Async()
+        public void Example_TrainMultivariateModel_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            ModelInfo modelInfo = new ModelInfo(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"));
+            Response<AnomalyDetectionModel> response = client.TrainMultivariateModel(modelInfo);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_TrainMultivariateModel_AllParameters_Convenience()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            ModelInfo modelInfo = new ModelInfo(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"))
             {
-                dataSource = "http://localhost:3000",
-                startTime = "2022-05-10T14:57:31.2311892-04:00",
-                endTime = "2022-05-10T14:57:31.2311892-04:00",
+                DataSchema = DataSchema.OneTable,
+                DisplayName = "<displayName>",
+                SlidingWindow = 1234,
+                AlignPolicy = new AlignPolicy()
+                {
+                    AlignMode = AlignMode.Inner,
+                    FillNAMethod = FillNAMethod.Previous,
+                    PaddingValue = 123.45F,
+                },
             };
+            Response<AnomalyDetectionModel> response = client.TrainMultivariateModel(modelInfo);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_TrainMultivariateModel_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            Response response = await client.TrainMultivariateModelAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+            {
+                ["dataSource"] = "http://localhost:3000",
+                ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+                ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+            });
+            Response response = await client.TrainMultivariateModelAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -674,27 +862,26 @@ public async Task Example_TrainMultivariateModel_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_TrainMultivariateModel_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                dataSource = "http://localhost:3000",
-                dataSchema = "OneTable",
-                startTime = "2022-05-10T14:57:31.2311892-04:00",
-                endTime = "2022-05-10T14:57:31.2311892-04:00",
-                displayName = "<displayName>",
-                slidingWindow = 1234,
-                alignPolicy = new
+                ["dataSource"] = "http://localhost:3000",
+                ["dataSchema"] = "OneTable",
+                ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+                ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+                ["displayName"] = "<displayName>",
+                ["slidingWindow"] = 1234,
+                ["alignPolicy"] = new Dictionary<string, object>()
                 {
-                    alignMode = "Inner",
-                    fillNAMethod = "Previous",
-                    paddingValue = 123.45f,
+                    ["alignMode"] = "Inner",
+                    ["fillNAMethod"] = "Previous",
+                    ["paddingValue"] = 123.45F,
                 },
-            };
-
-            Response response = await client.TrainMultivariateModelAsync(RequestContent.Create(data));
+            });
+            Response response = await client.TrainMultivariateModelAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -727,32 +914,44 @@ public async Task Example_TrainMultivariateModel_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_TrainMultivariateModel_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var modelInfo = new ModelInfo(new Uri("http://localhost:3000"), DateTimeOffset.UtcNow, DateTimeOffset.UtcNow)
+            ModelInfo modelInfo = new ModelInfo(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"));
+            Response<AnomalyDetectionModel> response = await client.TrainMultivariateModelAsync(modelInfo);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_TrainMultivariateModel_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            ModelInfo modelInfo = new ModelInfo(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"))
             {
                 DataSchema = DataSchema.OneTable,
-                DisplayName = "<DisplayName>",
+                DisplayName = "<displayName>",
                 SlidingWindow = 1234,
                 AlignPolicy = new AlignPolicy()
                 {
                     AlignMode = AlignMode.Inner,
                     FillNAMethod = FillNAMethod.Previous,
-                    PaddingValue = 3.14f,
+                    PaddingValue = 123.45F,
                 },
             };
-            var result = await client.TrainMultivariateModelAsync(modelInfo);
+            Response<AnomalyDetectionModel> response = await client.TrainMultivariateModelAsync(modelInfo);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteMultivariateModel()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
             Response response = client.DeleteMultivariateModel("<modelId>");
             Console.WriteLine(response.Status);
@@ -762,9 +961,9 @@ public void Example_DeleteMultivariateModel()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteMultivariateModel_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
             Response response = client.DeleteMultivariateModel("<modelId>");
             Console.WriteLine(response.Status);
@@ -774,9 +973,9 @@ public void Example_DeleteMultivariateModel_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteMultivariateModel_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
             Response response = await client.DeleteMultivariateModelAsync("<modelId>");
             Console.WriteLine(response.Status);
@@ -786,9 +985,9 @@ public async Task Example_DeleteMultivariateModel_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteMultivariateModel_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
             Response response = await client.DeleteMultivariateModelAsync("<modelId>");
             Console.WriteLine(response.Status);
@@ -798,11 +997,11 @@ public async Task Example_DeleteMultivariateModel_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMultivariateModel()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            Response response = client.GetMultivariateModel("<modelId>", new RequestContext());
+            Response response = client.GetMultivariateModel("<modelId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -814,11 +1013,11 @@ public void Example_GetMultivariateModel()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMultivariateModel_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            Response response = client.GetMultivariateModel("<modelId>", new RequestContext());
+            Response response = client.GetMultivariateModel("<modelId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -847,15 +1046,37 @@ public void Example_GetMultivariateModel_AllParameters()
             Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("lastTimestamp").ToString());
         }
 
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_GetMultivariateModel_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            Response<AnomalyDetectionModel> response = client.GetMultivariateModel("<modelId>");
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_GetMultivariateModel_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            Response<AnomalyDetectionModel> response = client.GetMultivariateModel("<modelId>");
+        }
+
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMultivariateModel_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            Response response = await client.GetMultivariateModelAsync("<modelId>", new RequestContext());
+            Response response = await client.GetMultivariateModelAsync("<modelId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -867,11 +1088,11 @@ public async Task Example_GetMultivariateModel_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMultivariateModel_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            Response response = await client.GetMultivariateModelAsync("<modelId>", new RequestContext());
+            Response response = await client.GetMultivariateModelAsync("<modelId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -904,29 +1125,39 @@ public async Task Example_GetMultivariateModel_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMultivariateModel_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var result = await client.GetMultivariateModelAsync("<modelId>");
+            Response<AnomalyDetectionModel> response = await client.GetMultivariateModelAsync("<modelId>");
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_GetMultivariateModel_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            Response<AnomalyDetectionModel> response = await client.GetMultivariateModelAsync("<modelId>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_DetectMultivariateBatchAnomaly()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                dataSource = "http://localhost:3000",
-                startTime = "2022-05-10T14:57:31.2311892-04:00",
-                endTime = "2022-05-10T14:57:31.2311892-04:00",
-            };
-
-            Response response = client.DetectMultivariateBatchAnomaly("<modelId>", RequestContent.Create(data));
+                ["dataSource"] = "http://localhost:3000",
+                ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+                ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+            });
+            Response response = client.DetectMultivariateBatchAnomaly("<modelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("resultId").ToString());
@@ -941,19 +1172,18 @@ public void Example_DetectMultivariateBatchAnomaly()
         [Ignore("Only validating compilation of examples")]
         public void Example_DetectMultivariateBatchAnomaly_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                dataSource = "http://localhost:3000",
-                topContributorCount = 1234,
-                startTime = "2022-05-10T14:57:31.2311892-04:00",
-                endTime = "2022-05-10T14:57:31.2311892-04:00",
-            };
-
-            Response response = client.DetectMultivariateBatchAnomaly("<modelId>", RequestContent.Create(data));
+                ["dataSource"] = "http://localhost:3000",
+                ["topContributorCount"] = 1234,
+                ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+                ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+            });
+            Response response = client.DetectMultivariateBatchAnomaly("<modelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("resultId").ToString());
@@ -982,20 +1212,46 @@ public void Example_DetectMultivariateBatchAnomaly_AllParameters()
 
         [Test]
         [Ignore("Only validating compilation of examples")]
-        public async Task Example_DetectMultivariateBatchAnomaly_Async()
+        public void Example_DetectMultivariateBatchAnomaly_Convenience()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            MultivariateBatchDetectionOptions options = new MultivariateBatchDetectionOptions(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"));
+            Response<MultivariateDetectionResult> response = client.DetectMultivariateBatchAnomaly("<modelId>", options);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_DetectMultivariateBatchAnomaly_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            MultivariateBatchDetectionOptions options = new MultivariateBatchDetectionOptions(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"))
             {
-                dataSource = "http://localhost:3000",
-                startTime = "2022-05-10T14:57:31.2311892-04:00",
-                endTime = "2022-05-10T14:57:31.2311892-04:00",
+                TopContributorCount = 1234,
             };
+            Response<MultivariateDetectionResult> response = client.DetectMultivariateBatchAnomaly("<modelId>", options);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_DetectMultivariateBatchAnomaly_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            Response response = await client.DetectMultivariateBatchAnomalyAsync("<modelId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+            {
+                ["dataSource"] = "http://localhost:3000",
+                ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+                ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+            });
+            Response response = await client.DetectMultivariateBatchAnomalyAsync("<modelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("resultId").ToString());
@@ -1010,19 +1266,18 @@ public async Task Example_DetectMultivariateBatchAnomaly_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DetectMultivariateBatchAnomaly_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                dataSource = "http://localhost:3000",
-                topContributorCount = 1234,
-                startTime = "2022-05-10T14:57:31.2311892-04:00",
-                endTime = "2022-05-10T14:57:31.2311892-04:00",
-            };
-
-            Response response = await client.DetectMultivariateBatchAnomalyAsync("<modelId>", RequestContent.Create(data));
+                ["dataSource"] = "http://localhost:3000",
+                ["topContributorCount"] = 1234,
+                ["startTime"] = "2022-05-10T14:57:31.2311892-04:00",
+                ["endTime"] = "2022-05-10T14:57:31.2311892-04:00",
+            });
+            Response response = await client.DetectMultivariateBatchAnomalyAsync("<modelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("resultId").ToString());
@@ -1053,41 +1308,56 @@ public async Task Example_DetectMultivariateBatchAnomaly_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DetectMultivariateBatchAnomaly_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var options = new MultivariateBatchDetectionOptions(new Uri("http://localhost:3000"), DateTimeOffset.UtcNow, DateTimeOffset.UtcNow)
+            MultivariateBatchDetectionOptions options = new MultivariateBatchDetectionOptions(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"));
+            Response<MultivariateDetectionResult> response = await client.DetectMultivariateBatchAnomalyAsync("<modelId>", options);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_DetectMultivariateBatchAnomaly_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            MultivariateBatchDetectionOptions options = new MultivariateBatchDetectionOptions(new Uri("http://localhost:3000"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"), DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"))
             {
                 TopContributorCount = 1234,
             };
-            var result = await client.DetectMultivariateBatchAnomalyAsync("<modelId>", options);
+            Response<MultivariateDetectionResult> response = await client.DetectMultivariateBatchAnomalyAsync("<modelId>", options);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_DetectMultivariateLastAnomaly()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                variables = new[] {
-        new {
-            variable = "<variable>",
-            timestamps = new[] {
-                "<String>"
-            },
-            values = new[] {
-                123.45f
-            },
-        }
-    },
-            };
-
-            Response response = client.DetectMultivariateLastAnomaly("<modelId>", RequestContent.Create(data));
+                ["variables"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["variable"] = "<variable>",
+["timestamps"] = new List<object>()
+{
+"<timestamps>"
+},
+["values"] = new List<object>()
+{
+123.45F
+},
+}
+},
+            });
+            Response response = client.DetectMultivariateLastAnomaly("<modelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1097,27 +1367,30 @@ public void Example_DetectMultivariateLastAnomaly()
         [Ignore("Only validating compilation of examples")]
         public void Example_DetectMultivariateLastAnomaly_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                variables = new[] {
-        new {
-            variable = "<variable>",
-            timestamps = new[] {
-                "<String>"
-            },
-            values = new[] {
-                123.45f
-            },
-        }
-    },
-                topContributorCount = 1234,
-            };
-
-            Response response = client.DetectMultivariateLastAnomaly("<modelId>", RequestContent.Create(data));
+                ["variables"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["variable"] = "<variable>",
+["timestamps"] = new List<object>()
+{
+"<timestamps>"
+},
+["values"] = new List<object>()
+{
+123.45F
+},
+}
+},
+                ["topContributorCount"] = 1234,
+            });
+            Response response = client.DetectMultivariateLastAnomaly("<modelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("variableStates")[0].GetProperty("variable").ToString());
@@ -1138,28 +1411,76 @@ public void Example_DetectMultivariateLastAnomaly_AllParameters()
 
         [Test]
         [Ignore("Only validating compilation of examples")]
-        public async Task Example_DetectMultivariateLastAnomaly_Async()
+        public void Example_DetectMultivariateLastAnomaly_Convenience()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            MultivariateLastDetectionOptions options = new MultivariateLastDetectionOptions(new List<VariableValues>()
+{
+new VariableValues("<variable>",new List<string>()
+{
+"<timestamps>"
+},new List<float>()
+{
+123.45F
+})
+});
+            Response<MultivariateLastDetectionResult> response = client.DetectMultivariateLastAnomaly("<modelId>", options);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_DetectMultivariateLastAnomaly_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            MultivariateLastDetectionOptions options = new MultivariateLastDetectionOptions(new List<VariableValues>()
+{
+new VariableValues("<variable>",new List<string>()
+{
+"<timestamps>"
+},new List<float>()
+{
+123.45F
+})
+})
             {
-                variables = new[] {
-        new {
-            variable = "<variable>",
-            timestamps = new[] {
-                "<String>"
-            },
-            values = new[] {
-                123.45f
-            },
-        }
-    },
+                TopContributorCount = 1234,
             };
+            Response<MultivariateLastDetectionResult> response = client.DetectMultivariateLastAnomaly("<modelId>", options);
+        }
 
-            Response response = await client.DetectMultivariateLastAnomalyAsync("<modelId>", RequestContent.Create(data));
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_DetectMultivariateLastAnomaly_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+            {
+                ["variables"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["variable"] = "<variable>",
+["timestamps"] = new List<object>()
+{
+"<timestamps>"
+},
+["values"] = new List<object>()
+{
+123.45F
+},
+}
+},
+            });
+            Response response = await client.DetectMultivariateLastAnomalyAsync("<modelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1169,27 +1490,30 @@ public async Task Example_DetectMultivariateLastAnomaly_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DetectMultivariateLastAnomaly_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                variables = new[] {
-        new {
-            variable = "<variable>",
-            timestamps = new[] {
-                "<String>"
-            },
-            values = new[] {
-                123.45f
-            },
-        }
-    },
-                topContributorCount = 1234,
-            };
-
-            Response response = await client.DetectMultivariateLastAnomalyAsync("<modelId>", RequestContent.Create(data));
+                ["variables"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["variable"] = "<variable>",
+["timestamps"] = new List<object>()
+{
+"<timestamps>"
+},
+["values"] = new List<object>()
+{
+123.45F
+},
+}
+},
+                ["topContributorCount"] = 1234,
+            });
+            Response response = await client.DetectMultivariateLastAnomalyAsync("<modelId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("variableStates")[0].GetProperty("variable").ToString());
@@ -1212,40 +1536,61 @@ public async Task Example_DetectMultivariateLastAnomaly_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DetectMultivariateLastAnomaly_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            var options = new MultivariateLastDetectionOptions(new VariableValues[]
-            {
-    new VariableValues("<variable>", new string[]
+            MultivariateLastDetectionOptions options = new MultivariateLastDetectionOptions(new List<VariableValues>()
+{
+new VariableValues("<variable>",new List<string>()
 {
-        "<null>"
-    }, new float[]
+"<timestamps>"
+},new List<float>()
 {
-        3.14f
-    })
-            })
+123.45F
+})
+});
+            Response<MultivariateLastDetectionResult> response = await client.DetectMultivariateLastAnomalyAsync("<modelId>", options);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_DetectMultivariateLastAnomaly_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            MultivariateLastDetectionOptions options = new MultivariateLastDetectionOptions(new List<VariableValues>()
+{
+new VariableValues("<variable>",new List<string>()
+{
+"<timestamps>"
+},new List<float>()
+{
+123.45F
+})
+})
             {
                 TopContributorCount = 1234,
             };
-            var result = await client.DetectMultivariateLastAnomalyAsync("<modelId>", options);
+            Response<MultivariateLastDetectionResult> response = await client.DetectMultivariateLastAnomalyAsync("<modelId>", options);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMultivariateModels()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            foreach (var item in client.GetMultivariateModels(1234, 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetMultivariateModels(null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("lastUpdatedTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastUpdatedTime").ToString());
             }
         }
 
@@ -1253,37 +1598,63 @@ public void Example_GetMultivariateModels()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMultivariateModels_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            foreach (var item in client.GetMultivariateModels(1234, 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetMultivariateModels(1234, 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("lastUpdatedTime").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("dataSource").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("dataSchema").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("endTime").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("displayName").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("slidingWindow").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("alignMode").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("fillNAMethod").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("paddingValue").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("epochIds")[0].ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("trainLosses")[0].ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("validationLosses")[0].ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("latenciesInSeconds")[0].ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("variable").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("filledNARatio").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("effectiveCount").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("firstTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("lastTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastUpdatedTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("dataSource").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("dataSchema").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("endTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("displayName").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("slidingWindow").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("alignMode").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("fillNAMethod").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("paddingValue").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("epochIds")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("trainLosses")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("validationLosses")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("latenciesInSeconds")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("variable").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("filledNARatio").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("effectiveCount").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("firstTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("lastTimestamp").ToString());
+            }
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_GetMultivariateModels_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            foreach (AnomalyDetectionModel item in client.GetMultivariateModels())
+            {
+            }
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_GetMultivariateModels_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            foreach (AnomalyDetectionModel item in client.GetMultivariateModels(skip: 1234, maxCount: 1234))
+            {
             }
         }
 
@@ -1291,16 +1662,16 @@ public void Example_GetMultivariateModels_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMultivariateModels_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            await foreach (var item in client.GetMultivariateModelsAsync(1234, 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetMultivariateModelsAsync(null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("lastUpdatedTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastUpdatedTime").ToString());
             }
         }
 
@@ -1308,37 +1679,37 @@ public async Task Example_GetMultivariateModels_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMultivariateModels_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            await foreach (var item in client.GetMultivariateModelsAsync(1234, 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetMultivariateModelsAsync(1234, 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("lastUpdatedTime").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("dataSource").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("dataSchema").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("endTime").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("displayName").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("slidingWindow").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("alignMode").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("fillNAMethod").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("paddingValue").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("epochIds")[0].ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("trainLosses")[0].ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("validationLosses")[0].ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("latenciesInSeconds")[0].ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("variable").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("filledNARatio").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("effectiveCount").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("firstTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("lastTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastUpdatedTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("dataSource").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("dataSchema").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("endTime").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("displayName").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("slidingWindow").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("alignMode").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("fillNAMethod").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("alignPolicy").GetProperty("paddingValue").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("errors")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("epochIds")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("trainLosses")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("validationLosses")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("modelState").GetProperty("latenciesInSeconds")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("variable").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("filledNARatio").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("effectiveCount").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("firstTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("modelInfo").GetProperty("diagnosticsInfo").GetProperty("variableStates")[0].GetProperty("lastTimestamp").ToString());
             }
         }
 
@@ -1346,11 +1717,24 @@ public async Task Example_GetMultivariateModels_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMultivariateModels_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new AnomalyDetectorClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
+
+            await foreach (AnomalyDetectionModel item in client.GetMultivariateModelsAsync())
+            {
+            }
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_GetMultivariateModels_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            AnomalyDetectorClient client = new AnomalyDetectorClient(endpoint, credential);
 
-            await foreach (var item in client.GetMultivariateModelsAsync(1234, 1234))
+            await foreach (AnomalyDetectionModel item in client.GetMultivariateModelsAsync(skip: 1234, maxCount: 1234))
             {
             }
         }
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/src/Generated/Docs/ConfigurationClient.xml b/sdk/appconfiguration/Azure.Data.AppConfiguration/src/Generated/Docs/ConfigurationClient.xml
index 7738a8e38370..175760201508 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/src/Generated/Docs/ConfigurationClient.xml
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/src/Generated/Docs/ConfigurationClient.xml
@@ -1,89 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <doc>
   <members>
-    <member name="CheckKeysAsync(string,string,string,RequestContext)">
-    </member>
-    <member name="CheckKeys(string,string,string,RequestContext)">
-    </member>
-    <member name="CheckKeyValuesAsync(string,string,string,string,IEnumerable{string},string,RequestContext)">
-    </member>
-    <member name="CheckKeyValues(string,string,string,string,IEnumerable{string},string,RequestContext)">
-    </member>
-    <member name="GetConfigurationSettingAsync(string,string,string,IEnumerable{string},MatchConditions,RequestContext)">
-    </member>
-    <member name="GetConfigurationSetting(string,string,string,IEnumerable{string},MatchConditions,RequestContext)">
-    </member>
-    <member name="SetConfigurationSettingAsync(string,RequestContent,ContentType,string,MatchConditions,RequestContext)">
-    </member>
-    <member name="SetConfigurationSetting(string,RequestContent,ContentType,string,MatchConditions,RequestContext)">
-    </member>
-    <member name="DeleteConfigurationSettingAsync(string,string,ETag?,RequestContext)">
-    </member>
-    <member name="DeleteConfigurationSetting(string,string,ETag?,RequestContext)">
-    </member>
-    <member name="CheckKeyValueAsync(string,string,string,IEnumerable{string},MatchConditions,RequestContext)">
-    </member>
-    <member name="CheckKeyValue(string,string,string,IEnumerable{string},MatchConditions,RequestContext)">
-    </member>
-    <member name="CheckSnapshotsAsync(string,RequestContext)">
-    </member>
-    <member name="CheckSnapshots(string,RequestContext)">
-    </member>
-    <member name="GetSnapshotAsync(string,IEnumerable{string},MatchConditions,RequestContext)">
-    </member>
-    <member name="GetSnapshot(string,IEnumerable{string},MatchConditions,RequestContext)">
-    </member>
-    <member name="UpdateSnapshotStatusAsync(string,RequestContent,MatchConditions,RequestContext)">
-    </member>
-    <member name="UpdateSnapshotStatus(string,RequestContent,MatchConditions,RequestContext)">
-    </member>
-    <member name="CheckSnapshotAsync(string,MatchConditions,RequestContext)">
-    </member>
-    <member name="CheckSnapshot(string,MatchConditions,RequestContext)">
-    </member>
-    <member name="CheckLabelsAsync(string,string,string,IEnumerable{string},RequestContext)">
-    </member>
-    <member name="CheckLabels(string,string,string,IEnumerable{string},RequestContext)">
-    </member>
-    <member name="CreateReadOnlyLockAsync(string,string,MatchConditions,RequestContext)">
-    </member>
-    <member name="CreateReadOnlyLock(string,string,MatchConditions,RequestContext)">
-    </member>
-    <member name="DeleteReadOnlyLockAsync(string,string,MatchConditions,RequestContext)">
-    </member>
-    <member name="DeleteReadOnlyLock(string,string,MatchConditions,RequestContext)">
-    </member>
-    <member name="CheckRevisionsAsync(string,string,string,string,IEnumerable{string},RequestContext)">
-    </member>
-    <member name="CheckRevisions(string,string,string,string,IEnumerable{string},RequestContext)">
-    </member>
-    <member name="GetOperationDetailsAsync(string,RequestContext)">
-    </member>
-    <member name="GetOperationDetails(string,RequestContext)">
-    </member>
-    <member name="GetKeysAsync(string,string,string,RequestContext)">
-    </member>
-    <member name="GetKeys(string,string,string,RequestContext)">
-    </member>
-    <member name="GetConfigurationSettingsAsync(string,string,string,string,IEnumerable{string},string,RequestContext)">
-    </member>
-    <member name="GetConfigurationSettings(string,string,string,string,IEnumerable{string},string,RequestContext)">
-    </member>
-    <member name="GetSnapshotsAsync(string,string,IEnumerable{string},IEnumerable{string},RequestContext)">
-    </member>
-    <member name="GetSnapshots(string,string,IEnumerable{string},IEnumerable{string},RequestContext)">
-    </member>
-    <member name="GetLabelsAsync(string,string,string,IEnumerable{string},RequestContext)">
-    </member>
-    <member name="GetLabels(string,string,string,IEnumerable{string},RequestContext)">
-    </member>
-    <member name="GetRevisionsAsync(string,string,string,string,IEnumerable{string},RequestContext)">
-    </member>
-    <member name="GetRevisions(string,string,string,string,IEnumerable{string},RequestContext)">
-    </member>
-    <member name="CreateSnapshotAsync(WaitUntil,string,RequestContent,ContentType,RequestContext)">
-    </member>
-    <member name="CreateSnapshot(WaitUntil,string,RequestContent,ContentType,RequestContext)">
-    </member>
+    <member name="CheckKeysAsync(string,string,string,RequestContext)" />
+    <member name="CheckKeys(string,string,string,RequestContext)" />
+    <member name="CheckKeyValuesAsync(string,string,string,string,IEnumerable{string},string,RequestContext)" />
+    <member name="CheckKeyValues(string,string,string,string,IEnumerable{string},string,RequestContext)" />
+    <member name="GetConfigurationSettingAsync(string,string,string,IEnumerable{string},MatchConditions,RequestContext)" />
+    <member name="GetConfigurationSetting(string,string,string,IEnumerable{string},MatchConditions,RequestContext)" />
+    <member name="SetConfigurationSettingAsync(string,RequestContent,ContentType,string,MatchConditions,RequestContext)" />
+    <member name="SetConfigurationSetting(string,RequestContent,ContentType,string,MatchConditions,RequestContext)" />
+    <member name="DeleteConfigurationSettingAsync(string,string,ETag?,RequestContext)" />
+    <member name="DeleteConfigurationSetting(string,string,ETag?,RequestContext)" />
+    <member name="CheckKeyValueAsync(string,string,string,IEnumerable{string},MatchConditions,RequestContext)" />
+    <member name="CheckKeyValue(string,string,string,IEnumerable{string},MatchConditions,RequestContext)" />
+    <member name="CheckSnapshotsAsync(string,RequestContext)" />
+    <member name="CheckSnapshots(string,RequestContext)" />
+    <member name="GetSnapshotAsync(string,IEnumerable{string},MatchConditions,RequestContext)" />
+    <member name="GetSnapshot(string,IEnumerable{string},MatchConditions,RequestContext)" />
+    <member name="UpdateSnapshotStatusAsync(string,RequestContent,MatchConditions,RequestContext)" />
+    <member name="UpdateSnapshotStatus(string,RequestContent,MatchConditions,RequestContext)" />
+    <member name="CheckSnapshotAsync(string,MatchConditions,RequestContext)" />
+    <member name="CheckSnapshot(string,MatchConditions,RequestContext)" />
+    <member name="CheckLabelsAsync(string,string,string,IEnumerable{string},RequestContext)" />
+    <member name="CheckLabels(string,string,string,IEnumerable{string},RequestContext)" />
+    <member name="CreateReadOnlyLockAsync(string,string,MatchConditions,RequestContext)" />
+    <member name="CreateReadOnlyLock(string,string,MatchConditions,RequestContext)" />
+    <member name="DeleteReadOnlyLockAsync(string,string,MatchConditions,RequestContext)" />
+    <member name="DeleteReadOnlyLock(string,string,MatchConditions,RequestContext)" />
+    <member name="CheckRevisionsAsync(string,string,string,string,IEnumerable{string},RequestContext)" />
+    <member name="CheckRevisions(string,string,string,string,IEnumerable{string},RequestContext)" />
+    <member name="GetOperationDetailsAsync(string,RequestContext)" />
+    <member name="GetOperationDetails(string,RequestContext)" />
+    <member name="GetKeysAsync(string,string,string,RequestContext)" />
+    <member name="GetKeys(string,string,string,RequestContext)" />
+    <member name="GetConfigurationSettingsAsync(string,string,string,string,IEnumerable{string},string,RequestContext)" />
+    <member name="GetConfigurationSettings(string,string,string,string,IEnumerable{string},string,RequestContext)" />
+    <member name="GetSnapshotsAsync(string,string,IEnumerable{string},IEnumerable{string},RequestContext)" />
+    <member name="GetSnapshots(string,string,IEnumerable{string},IEnumerable{string},RequestContext)" />
+    <member name="GetLabelsAsync(string,string,string,IEnumerable{string},RequestContext)" />
+    <member name="GetLabels(string,string,string,IEnumerable{string},RequestContext)" />
+    <member name="GetRevisionsAsync(string,string,string,string,IEnumerable{string},RequestContext)" />
+    <member name="GetRevisions(string,string,string,string,IEnumerable{string},RequestContext)" />
+    <member name="CreateSnapshotAsync(WaitUntil,string,RequestContent,ContentType,RequestContext)" />
+    <member name="CreateSnapshot(WaitUntil,string,RequestContent,ContentType,RequestContext)" />
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/Generated/Samples/Samples_ConfigurationClient.cs b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/Generated/Samples/Samples_ConfigurationClient.cs
index 7b6cf66a90cc..cae283a0de5a 100644
--- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/Generated/Samples/Samples_ConfigurationClient.cs
+++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tests/Generated/Samples/Samples_ConfigurationClient.cs
@@ -5,12 +5,6 @@
 
 #nullable disable
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
-using Azure;
-using Azure.Core;
 using Azure.Identity;
 
 namespace Azure.Data.AppConfiguration.Samples
diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Conversations/src/Generated/Docs/ConversationAnalysisClient.xml b/sdk/cognitivelanguage/Azure.AI.Language.Conversations/src/Generated/Docs/ConversationAnalysisClient.xml
index 4275dafca8b6..42934396a913 100644
--- a/sdk/cognitivelanguage/Azure.AI.Language.Conversations/src/Generated/Docs/ConversationAnalysisClient.xml
+++ b/sdk/cognitivelanguage/Azure.AI.Language.Conversations/src/Generated/Docs/ConversationAnalysisClient.xml
@@ -2,182 +2,182 @@
 <doc>
   <members>
     <member name="AnalyzeConversationAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call AnalyzeConversationAsync with required request content, and how to parse the result.
+      <example>
+This sample shows how to call AnalyzeConversationAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAnalysisClient(endpoint, credential);
-
-var data = new {
-    analysisInput = new {
-        conversationItem = new {
-            text = "<text>",
-            id = "<id>",
-            participantId = "<participantId>",
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["analysisInput"] = new Dictionary<string, object>()
+    {
+        ["conversationItem"] = new Dictionary<string, object>()
+        {
+            ["id"] = "<id>",
+            ["participantId"] = "<participantId>",
         },
     },
-    parameters = new {
-        projectName = "<projectName>",
-        deploymentName = "<deploymentName>",
+    ["parameters"] = new Dictionary<string, object>()
+    {
+        ["projectName"] = "<projectName>",
+        ["deploymentName"] = "<deploymentName>",
     },
-    kind = "Conversation",
-};
-
-Response response = await client.AnalyzeConversationAsync(RequestContent.Create(data));
+    ["kind"] = "Conversation",
+});
+Response response = await client.AnalyzeConversationAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 ]]></code>
-This sample shows how to call AnalyzeConversationAsync with all request content, and how to parse the result.
+This sample shows how to call AnalyzeConversationAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAnalysisClient(endpoint, credential);
-
-var data = new {
-    analysisInput = new {
-        conversationItem = new {
-            text = "<text>",
-            id = "<id>",
-            participantId = "<participantId>",
-            language = "<language>",
-            modality = "transcript",
-            role = "agent",
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["analysisInput"] = new Dictionary<string, object>()
+    {
+        ["conversationItem"] = new Dictionary<string, object>()
+        {
+            ["id"] = "<id>",
+            ["participantId"] = "<participantId>",
+            ["language"] = "<language>",
+            ["modality"] = "transcript",
+            ["role"] = "agent",
         },
     },
-    parameters = new {
-        projectName = "<projectName>",
-        deploymentName = "<deploymentName>",
-        verbose = true,
-        isLoggingEnabled = true,
-        stringIndexType = "Utf16CodeUnit",
-        directTarget = "<directTarget>",
-        targetProjectParameters = new {
-            key = new {
-                query = "<query>",
-                callingOptions = new {
-                    verbose = true,
-                    log = true,
-                    show_all_intents = true,
-                    timezoneOffset = 123.45f,
-                    spellCheck = true,
-                    bing_spell_check_subscription_key = "<bing-spell-check-subscription-key>",
+    ["parameters"] = new Dictionary<string, object>()
+    {
+        ["projectName"] = "<projectName>",
+        ["deploymentName"] = "<deploymentName>",
+        ["verbose"] = true,
+        ["isLoggingEnabled"] = true,
+        ["stringIndexType"] = "Utf16CodeUnit",
+        ["directTarget"] = "<directTarget>",
+        ["targetProjectParameters"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>()
+            {
+                ["query"] = "<query>",
+                ["callingOptions"] = new Dictionary<string, object>()
+                {
+                    ["verbose"] = true,
+                    ["log"] = true,
+                    ["show-all-intents"] = true,
+                    ["timezoneOffset"] = 123.45F,
+                    ["spellCheck"] = true,
+                    ["bing-spell-check-subscription-key"] = "<bing-spell-check-subscription-key>",
                 },
-                targetProjectKind = "Luis",
-                apiVersion = "<apiVersion>",
+                ["targetProjectKind"] = "Luis",
+                ["apiVersion"] = "<apiVersion>",
             },
         },
     },
-    kind = "Conversation",
-};
-
-Response response = await client.AnalyzeConversationAsync(RequestContent.Create(data));
+    ["kind"] = "Conversation",
+});
+Response response = await client.AnalyzeConversationAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversation-analysis-runtime/analyze-conversation
-
-</remarks>
+]]></code></example>
     </member>
     <member name="AnalyzeConversation(RequestContent,RequestContext)">
-<example>
-This sample shows how to call AnalyzeConversation with required request content, and how to parse the result.
+      <example>
+This sample shows how to call AnalyzeConversation and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAnalysisClient(endpoint, credential);
-
-var data = new {
-    analysisInput = new {
-        conversationItem = new {
-            text = "<text>",
-            id = "<id>",
-            participantId = "<participantId>",
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["analysisInput"] = new Dictionary<string, object>()
+    {
+        ["conversationItem"] = new Dictionary<string, object>()
+        {
+            ["id"] = "<id>",
+            ["participantId"] = "<participantId>",
         },
     },
-    parameters = new {
-        projectName = "<projectName>",
-        deploymentName = "<deploymentName>",
+    ["parameters"] = new Dictionary<string, object>()
+    {
+        ["projectName"] = "<projectName>",
+        ["deploymentName"] = "<deploymentName>",
     },
-    kind = "Conversation",
-};
-
-Response response = client.AnalyzeConversation(RequestContent.Create(data));
+    ["kind"] = "Conversation",
+});
+Response response = client.AnalyzeConversation(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 ]]></code>
-This sample shows how to call AnalyzeConversation with all request content, and how to parse the result.
+This sample shows how to call AnalyzeConversation with all request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAnalysisClient(endpoint, credential);
-
-var data = new {
-    analysisInput = new {
-        conversationItem = new {
-            text = "<text>",
-            id = "<id>",
-            participantId = "<participantId>",
-            language = "<language>",
-            modality = "transcript",
-            role = "agent",
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["analysisInput"] = new Dictionary<string, object>()
+    {
+        ["conversationItem"] = new Dictionary<string, object>()
+        {
+            ["id"] = "<id>",
+            ["participantId"] = "<participantId>",
+            ["language"] = "<language>",
+            ["modality"] = "transcript",
+            ["role"] = "agent",
         },
     },
-    parameters = new {
-        projectName = "<projectName>",
-        deploymentName = "<deploymentName>",
-        verbose = true,
-        isLoggingEnabled = true,
-        stringIndexType = "Utf16CodeUnit",
-        directTarget = "<directTarget>",
-        targetProjectParameters = new {
-            key = new {
-                query = "<query>",
-                callingOptions = new {
-                    verbose = true,
-                    log = true,
-                    show_all_intents = true,
-                    timezoneOffset = 123.45f,
-                    spellCheck = true,
-                    bing_spell_check_subscription_key = "<bing-spell-check-subscription-key>",
+    ["parameters"] = new Dictionary<string, object>()
+    {
+        ["projectName"] = "<projectName>",
+        ["deploymentName"] = "<deploymentName>",
+        ["verbose"] = true,
+        ["isLoggingEnabled"] = true,
+        ["stringIndexType"] = "Utf16CodeUnit",
+        ["directTarget"] = "<directTarget>",
+        ["targetProjectParameters"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>()
+            {
+                ["query"] = "<query>",
+                ["callingOptions"] = new Dictionary<string, object>()
+                {
+                    ["verbose"] = true,
+                    ["log"] = true,
+                    ["show-all-intents"] = true,
+                    ["timezoneOffset"] = 123.45F,
+                    ["spellCheck"] = true,
+                    ["bing-spell-check-subscription-key"] = "<bing-spell-check-subscription-key>",
                 },
-                targetProjectKind = "Luis",
-                apiVersion = "<apiVersion>",
+                ["targetProjectKind"] = "Luis",
+                ["apiVersion"] = "<apiVersion>",
             },
         },
     },
-    kind = "Conversation",
-};
-
-Response response = client.AnalyzeConversation(RequestContent.Create(data));
+    ["kind"] = "Conversation",
+});
+Response response = client.AnalyzeConversation(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversation-analysis-runtime/analyze-conversation
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetAnalyzeConversationJobStatusAsync(Guid,bool?,RequestContext)">
-<example>
-This sample shows how to call GetAnalyzeConversationJobStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAnalyzeConversationJobStatusAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAnalysisClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-Response response = await client.GetAnalyzeConversationJobStatusAsync(Guid.NewGuid());
+Response response = await client.GetAnalyzeConversationJobStatusAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -185,13 +185,13 @@ Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call GetAnalyzeConversationJobStatusAsync with all parameters, and how to parse the result.
+This sample shows how to call GetAnalyzeConversationJobStatusAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAnalysisClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-Response response = await client.GetAnalyzeConversationJobStatusAsync(Guid.NewGuid(), true);
+Response response = await client.GetAnalyzeConversationJobStatusAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), showStats: true);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("displayName").ToString());
@@ -208,31 +208,24 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("nextLink").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/analyze-conversation/job-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetAnalyzeConversationJobStatus(Guid,bool?,RequestContext)">
-<example>
-This sample shows how to call GetAnalyzeConversationJobStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAnalyzeConversationJobStatus and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAnalysisClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-Response response = client.GetAnalyzeConversationJobStatus(Guid.NewGuid());
+Response response = client.GetAnalyzeConversationJobStatus(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -240,13 +233,13 @@ Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call GetAnalyzeConversationJobStatus with all parameters, and how to parse the result.
+This sample shows how to call GetAnalyzeConversationJobStatus with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAnalysisClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-Response response = client.GetAnalyzeConversationJobStatus(Guid.NewGuid(), true);
+Response response = client.GetAnalyzeConversationJobStatus(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), showStats: true);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("displayName").ToString());
@@ -263,109 +256,118 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("nextLink").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/analyze-conversation/job-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="AnalyzeConversationsAsync(WaitUntil,RequestContent,RequestContext)">
-<example>
-This sample shows how to call AnalyzeConversationsAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call AnalyzeConversationsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAnalysisClient(endpoint, credential);
-
-var data = new {
-    analysisInput = new {
-        conversations = new[] {
-            new {
-                conversationItems = new[] {
-                    new {
-                        text = "<text>",
-                        id = "<id>",
-                        participantId = "<participantId>",
-                    }
-                },
-                id = "<id>",
-                language = "<language>",
-                modality = "text",
-            }
-        },
-    },
-    tasks = new[] {
-        new {
-            kind = "ConversationalSummarizationTask",
-        }
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["analysisInput"] = new Dictionary<string, object>()
+    {
+        ["conversations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["conversationItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["text"] = "<text>",
+["id"] = "<id>",
+["participantId"] = "<participantId>",
+}
+},
+["id"] = "<id>",
+["language"] = "<language>",
+["modality"] = "text",
+}
+},
     },
-};
-
-var operation = await client.AnalyzeConversationsAsync(WaitUntil.Completed, RequestContent.Create(data));
-
+    ["tasks"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["kind"] = "ConversationalSummarizationTask",
+}
+},
+});
+Operation<BinaryData> operation = await client.AnalyzeConversationsAsync(WaitUntil.Completed, content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call AnalyzeConversationsAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call AnalyzeConversationsAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAnalysisClient(endpoint, credential);
-
-var data = new {
-    displayName = "<displayName>",
-    analysisInput = new {
-        conversations = new[] {
-            new {
-                conversationItems = new[] {
-                    new {
-                        text = "<text>",
-                        id = "<id>",
-                        participantId = "<participantId>",
-                        language = "<language>",
-                        modality = "transcript",
-                        role = "agent",
-                    }
-                },
-                id = "<id>",
-                language = "<language>",
-                modality = "text",
-                domain = "finance",
-            }
-        },
-    },
-    tasks = new[] {
-        new {
-            parameters = new {
-                summaryAspects = new[] {
-                    "issue"
-                },
-                modelVersion = "<modelVersion>",
-                loggingOptOut = true,
-            },
-            kind = "ConversationalSummarizationTask",
-            taskName = "<taskName>",
-        }
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["displayName"] = "<displayName>",
+    ["analysisInput"] = new Dictionary<string, object>()
+    {
+        ["conversations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["conversationItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["text"] = "<text>",
+["id"] = "<id>",
+["participantId"] = "<participantId>",
+["language"] = "<language>",
+["modality"] = "transcript",
+["role"] = "agent",
+}
+},
+["id"] = "<id>",
+["language"] = "<language>",
+["modality"] = "text",
+["domain"] = "finance",
+}
+},
     },
-};
-
-var operation = await client.AnalyzeConversationsAsync(WaitUntil.Completed, RequestContent.Create(data));
-
+    ["tasks"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["parameters"] = new Dictionary<string, object>()
+{
+["summaryAspects"] = new List<object>()
+{
+"issue"
+},
+["modelVersion"] = "<modelVersion>",
+["loggingOptOut"] = true,
+},
+["kind"] = "ConversationalSummarizationTask",
+["taskName"] = "<taskName>",
+}
+},
+});
+Operation<BinaryData> operation = await client.AnalyzeConversationsAsync(WaitUntil.Completed, content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("displayName").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -381,109 +383,118 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("nextLink").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/analyze-conversation/submit-job
-
-</remarks>
+]]></code></example>
     </member>
     <member name="AnalyzeConversations(WaitUntil,RequestContent,RequestContext)">
-<example>
-This sample shows how to call AnalyzeConversations with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call AnalyzeConversations and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAnalysisClient(endpoint, credential);
-
-var data = new {
-    analysisInput = new {
-        conversations = new[] {
-            new {
-                conversationItems = new[] {
-                    new {
-                        text = "<text>",
-                        id = "<id>",
-                        participantId = "<participantId>",
-                    }
-                },
-                id = "<id>",
-                language = "<language>",
-                modality = "text",
-            }
-        },
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["analysisInput"] = new Dictionary<string, object>()
+    {
+        ["conversations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["conversationItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["text"] = "<text>",
+["id"] = "<id>",
+["participantId"] = "<participantId>",
+}
+},
+["id"] = "<id>",
+["language"] = "<language>",
+["modality"] = "text",
+}
+},
     },
-    tasks = new[] {
-        new {
-            kind = "ConversationalSummarizationTask",
-        }
-    },
-};
-
-var operation = client.AnalyzeConversations(WaitUntil.Completed, RequestContent.Create(data));
-
+    ["tasks"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["kind"] = "ConversationalSummarizationTask",
+}
+},
+});
+Operation<BinaryData> operation = client.AnalyzeConversations(WaitUntil.Completed, content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call AnalyzeConversations with all parameters and request content, and how to parse the result.
+This sample shows how to call AnalyzeConversations with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAnalysisClient(endpoint, credential);
-
-var data = new {
-    displayName = "<displayName>",
-    analysisInput = new {
-        conversations = new[] {
-            new {
-                conversationItems = new[] {
-                    new {
-                        text = "<text>",
-                        id = "<id>",
-                        participantId = "<participantId>",
-                        language = "<language>",
-                        modality = "transcript",
-                        role = "agent",
-                    }
-                },
-                id = "<id>",
-                language = "<language>",
-                modality = "text",
-                domain = "finance",
-            }
-        },
-    },
-    tasks = new[] {
-        new {
-            parameters = new {
-                summaryAspects = new[] {
-                    "issue"
-                },
-                modelVersion = "<modelVersion>",
-                loggingOptOut = true,
-            },
-            kind = "ConversationalSummarizationTask",
-            taskName = "<taskName>",
-        }
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["displayName"] = "<displayName>",
+    ["analysisInput"] = new Dictionary<string, object>()
+    {
+        ["conversations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["conversationItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["text"] = "<text>",
+["id"] = "<id>",
+["participantId"] = "<participantId>",
+["language"] = "<language>",
+["modality"] = "transcript",
+["role"] = "agent",
+}
+},
+["id"] = "<id>",
+["language"] = "<language>",
+["modality"] = "text",
+["domain"] = "finance",
+}
+},
     },
-};
-
-var operation = client.AnalyzeConversations(WaitUntil.Completed, RequestContent.Create(data));
-
+    ["tasks"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["parameters"] = new Dictionary<string, object>()
+{
+["summaryAspects"] = new List<object>()
+{
+"issue"
+},
+["modelVersion"] = "<modelVersion>",
+["loggingOptOut"] = true,
+},
+["kind"] = "ConversationalSummarizationTask",
+["taskName"] = "<taskName>",
+}
+},
+});
+Operation<BinaryData> operation = client.AnalyzeConversations(WaitUntil.Completed, content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("displayName").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -499,61 +510,52 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("nextLink").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/analyze-conversation/submit-job
-
-</remarks>
+]]></code></example>
     </member>
     <member name="CancelAnalyzeConversationsAsync(WaitUntil,Guid,RequestContext)">
-<example>
-This sample shows how to call CancelAnalyzeConversationsAsync with required parameters.
+      <example>
+This sample shows how to call CancelAnalyzeConversationsAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAnalysisClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-var operation = await client.CancelAnalyzeConversationsAsync(WaitUntil.Completed, Guid.NewGuid());
-
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = await client.CancelAnalyzeConversationsAsync(WaitUntil.Completed, Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/analyze-conversation/cancel-job
+This sample shows how to call CancelAnalyzeConversationsAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-</remarks>
+Operation operation = await client.CancelAnalyzeConversationsAsync(WaitUntil.Completed, Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
+]]></code></example>
     </member>
     <member name="CancelAnalyzeConversations(WaitUntil,Guid,RequestContext)">
-<example>
-This sample shows how to call CancelAnalyzeConversations with required parameters.
+      <example>
+This sample shows how to call CancelAnalyzeConversations.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAnalysisClient(endpoint, credential);
-
-var operation = client.CancelAnalyzeConversations(WaitUntil.Completed, Guid.NewGuid());
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = client.CancelAnalyzeConversations(WaitUntil.Completed, Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/analyze-conversation/cancel-job
+This sample shows how to call CancelAnalyzeConversations with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-</remarks>
+Operation operation = client.CancelAnalyzeConversations(WaitUntil.Completed, Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Conversations/src/Generated/Docs/ConversationAuthoringClient.xml b/sdk/cognitivelanguage/Azure.AI.Language.Conversations/src/Generated/Docs/ConversationAuthoringClient.xml
index 2467017d890d..4e7f92f532fe 100644
--- a/sdk/cognitivelanguage/Azure.AI.Language.Conversations/src/Generated/Docs/ConversationAuthoringClient.xml
+++ b/sdk/cognitivelanguage/Azure.AI.Language.Conversations/src/Generated/Docs/ConversationAuthoringClient.xml
@@ -2,20 +2,20 @@
 <doc>
   <members>
     <member name="CreateProjectAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateProjectAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateProjectAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-var data = new {
-    projectKind = "Conversation",
-    projectName = "<projectName>",
-    language = "<language>",
-};
-
-Response response = await client.CreateProjectAsync("<projectName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["projectKind"] = "Conversation",
+    ["projectName"] = "<projectName>",
+    ["language"] = "<language>",
+});
+Response response = await client.CreateProjectAsync("<projectName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -24,24 +24,25 @@ Console.WriteLine(result.GetProperty("projectKind").ToString());
 Console.WriteLine(result.GetProperty("projectName").ToString());
 Console.WriteLine(result.GetProperty("language").ToString());
 ]]></code>
-This sample shows how to call CreateProjectAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateProjectAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-var data = new {
-    projectKind = "Conversation",
-    settings = new {
-        confidenceThreshold = 123.45f,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["projectKind"] = "Conversation",
+    ["settings"] = new Dictionary<string, object>()
+    {
+        ["confidenceThreshold"] = 123.45F,
     },
-    projectName = "<projectName>",
-    multilingual = true,
-    description = "<description>",
-    language = "<language>",
-};
-
-Response response = await client.CreateProjectAsync("<projectName>", RequestContent.Create(data));
+    ["projectName"] = "<projectName>",
+    ["multilingual"] = true,
+    ["description"] = "<description>",
+    ["language"] = "<language>",
+});
+Response response = await client.CreateProjectAsync("<projectName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -54,30 +55,23 @@ Console.WriteLine(result.GetProperty("projectName").ToString());
 Console.WriteLine(result.GetProperty("multilingual").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("language").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/create-project
-
-</remarks>
+]]></code></example>
     </member>
     <member name="CreateProject(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateProject with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateProject and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var data = new {
-    projectKind = "Conversation",
-    projectName = "<projectName>",
-    language = "<language>",
-};
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-Response response = client.CreateProject("<projectName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["projectKind"] = "Conversation",
+    ["projectName"] = "<projectName>",
+    ["language"] = "<language>",
+});
+Response response = client.CreateProject("<projectName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -86,24 +80,25 @@ Console.WriteLine(result.GetProperty("projectKind").ToString());
 Console.WriteLine(result.GetProperty("projectName").ToString());
 Console.WriteLine(result.GetProperty("language").ToString());
 ]]></code>
-This sample shows how to call CreateProject with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateProject with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-var data = new {
-    projectKind = "Conversation",
-    settings = new {
-        confidenceThreshold = 123.45f,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["projectKind"] = "Conversation",
+    ["settings"] = new Dictionary<string, object>()
+    {
+        ["confidenceThreshold"] = 123.45F,
     },
-    projectName = "<projectName>",
-    multilingual = true,
-    description = "<description>",
-    language = "<language>",
-};
-
-Response response = client.CreateProject("<projectName>", RequestContent.Create(data));
+    ["projectName"] = "<projectName>",
+    ["multilingual"] = true,
+    ["description"] = "<description>",
+    ["language"] = "<language>",
+});
+Response response = client.CreateProject("<projectName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -116,22 +111,30 @@ Console.WriteLine(result.GetProperty("projectName").ToString());
 Console.WriteLine(result.GetProperty("multilingual").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("language").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/create-project
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetProjectAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetProjectAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetProjectAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = await client.GetProjectAsync("<projectName>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
+Console.WriteLine(result.GetProperty("projectKind").ToString());
+Console.WriteLine(result.GetProperty("projectName").ToString());
+Console.WriteLine(result.GetProperty("language").ToString());
+]]></code>
+This sample shows how to call GetProjectAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = await client.GetProjectAsync("<projectName>");
 
@@ -146,22 +149,30 @@ Console.WriteLine(result.GetProperty("projectName").ToString());
 Console.WriteLine(result.GetProperty("multilingual").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("language").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-project
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetProject(string,RequestContext)">
-<example>
-This sample shows how to call GetProject with required parameters and parse the result.
+      <example>
+This sample shows how to call GetProject and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = client.GetProject("<projectName>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
+Console.WriteLine(result.GetProperty("projectKind").ToString());
+Console.WriteLine(result.GetProperty("projectName").ToString());
+Console.WriteLine(result.GetProperty("language").ToString());
+]]></code>
+This sample shows how to call GetProject with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = client.GetProject("<projectName>");
 
@@ -176,22 +187,15 @@ Console.WriteLine(result.GetProperty("projectName").ToString());
 Console.WriteLine(result.GetProperty("multilingual").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("language").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-project
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetDeploymentAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeploymentAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeploymentAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = await client.GetDeploymentAsync("<projectName>", "<deploymentName>");
 
@@ -203,21 +207,30 @@ Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
 Console.WriteLine(result.GetProperty("deploymentExpirationDate").ToString());
 Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetDeploymentAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-deployment
+Response response = await client.GetDeploymentAsync("<projectName>", "<deploymentName>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deploymentName").ToString());
+Console.WriteLine(result.GetProperty("modelId").ToString());
+Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+Console.WriteLine(result.GetProperty("deploymentExpirationDate").ToString());
+Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
+]]></code></example>
     </member>
     <member name="GetDeployment(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeployment with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeployment and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = client.GetDeployment("<projectName>", "<deploymentName>");
 
@@ -229,21 +242,44 @@ Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
 Console.WriteLine(result.GetProperty("deploymentExpirationDate").ToString());
 Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetDeployment with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-deployment
+Response response = client.GetDeployment("<projectName>", "<deploymentName>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deploymentName").ToString());
+Console.WriteLine(result.GetProperty("modelId").ToString());
+Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+Console.WriteLine(result.GetProperty("deploymentExpirationDate").ToString());
+Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
+]]></code></example>
     </member>
     <member name="GetDeploymentJobStatusAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeploymentJobStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeploymentJobStatusAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = await client.GetDeploymentJobStatusAsync("<projectName>", "<deploymentName>", "<jobId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call GetDeploymentJobStatusAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = await client.GetDeploymentJobStatusAsync("<projectName>", "<deploymentName>", "<jobId>");
 
@@ -263,28 +299,35 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-deployment-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetDeploymentJobStatus(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeploymentJobStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeploymentJobStatus and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = client.GetDeploymentJobStatus("<projectName>", "<deploymentName>", "<jobId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call GetDeploymentJobStatus with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = client.GetDeploymentJobStatus("<projectName>", "<deploymentName>", "<jobId>");
 
@@ -304,28 +347,35 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-deployment-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetSwapDeploymentsJobStatusAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetSwapDeploymentsJobStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSwapDeploymentsJobStatusAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = await client.GetSwapDeploymentsJobStatusAsync("<projectName>", "<jobId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call GetSwapDeploymentsJobStatusAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = await client.GetSwapDeploymentsJobStatusAsync("<projectName>", "<jobId>");
 
@@ -345,28 +395,35 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-swap-deployments-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetSwapDeploymentsJobStatus(string,string,RequestContext)">
-<example>
-This sample shows how to call GetSwapDeploymentsJobStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSwapDeploymentsJobStatus and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = client.GetSwapDeploymentsJobStatus("<projectName>", "<jobId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call GetSwapDeploymentsJobStatus with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = client.GetSwapDeploymentsJobStatus("<projectName>", "<jobId>");
 
@@ -386,28 +443,32 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-swap-deployments-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetExportProjectJobStatusAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetExportProjectJobStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetExportProjectJobStatusAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = await client.GetExportProjectJobStatusAsync("<projectName>", "<jobId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetExportProjectJobStatusAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = await client.GetExportProjectJobStatusAsync("<projectName>", "<jobId>");
 
@@ -428,28 +489,32 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-export-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetExportProjectJobStatus(string,string,RequestContext)">
-<example>
-This sample shows how to call GetExportProjectJobStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetExportProjectJobStatus and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = client.GetExportProjectJobStatus("<projectName>", "<jobId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetExportProjectJobStatus with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = client.GetExportProjectJobStatus("<projectName>", "<jobId>");
 
@@ -470,28 +535,35 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-export-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetImportProjectJobStatusAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetImportProjectJobStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetImportProjectJobStatusAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = await client.GetImportProjectJobStatusAsync("<projectName>", "<jobId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call GetImportProjectJobStatusAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = await client.GetImportProjectJobStatusAsync("<projectName>", "<jobId>");
 
@@ -511,28 +583,35 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-import-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetImportProjectJobStatus(string,string,RequestContext)">
-<example>
-This sample shows how to call GetImportProjectJobStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetImportProjectJobStatus and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = client.GetImportProjectJobStatus("<projectName>", "<jobId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call GetImportProjectJobStatus with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = client.GetImportProjectJobStatus("<projectName>", "<jobId>");
 
@@ -552,28 +631,21 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-import-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetTrainedModelAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetTrainedModelAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTrainedModelAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = await client.GetTrainedModelAsync("<projectName>", "<trainedModelLabel>");
 
@@ -586,21 +658,31 @@ Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
 Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
 Console.WriteLine(result.GetProperty("hasSnapshot").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetTrainedModelAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-trained-model
+Response response = await client.GetTrainedModelAsync("<projectName>", "<trainedModelLabel>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("label").ToString());
+Console.WriteLine(result.GetProperty("modelId").ToString());
+Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastTrainingDurationInSeconds").ToString());
+Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
+Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
+Console.WriteLine(result.GetProperty("hasSnapshot").ToString());
+]]></code></example>
     </member>
     <member name="GetTrainedModel(string,string,RequestContext)">
-<example>
-This sample shows how to call GetTrainedModel with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTrainedModel and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = client.GetTrainedModel("<projectName>", "<trainedModelLabel>");
 
@@ -613,165 +695,259 @@ Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
 Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
 Console.WriteLine(result.GetProperty("hasSnapshot").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetTrainedModel with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-trained-model
+Response response = client.GetTrainedModel("<projectName>", "<trainedModelLabel>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("label").ToString());
+Console.WriteLine(result.GetProperty("modelId").ToString());
+Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastTrainingDurationInSeconds").ToString());
+Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
+Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
+Console.WriteLine(result.GetProperty("hasSnapshot").ToString());
+]]></code></example>
     </member>
     <member name="DeleteTrainedModelAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteTrainedModelAsync with required parameters.
+      <example>
+This sample shows how to call DeleteTrainedModelAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = await client.DeleteTrainedModelAsync("<projectName>", "<trainedModelLabel>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/delete-trained-model
+This sample shows how to call DeleteTrainedModelAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+Response response = await client.DeleteTrainedModelAsync("<projectName>", "<trainedModelLabel>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteTrainedModel(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteTrainedModel with required parameters.
+      <example>
+This sample shows how to call DeleteTrainedModel.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = client.DeleteTrainedModel("<projectName>", "<trainedModelLabel>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/delete-trained-model
+This sample shows how to call DeleteTrainedModel with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+Response response = client.DeleteTrainedModel("<projectName>", "<trainedModelLabel>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetModelEvaluationSummaryAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetModelEvaluationSummaryAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetModelEvaluationSummaryAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = await client.GetModelEvaluationSummaryAsync("<projectName>", "<trainedModelLabel>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("normalizedValue").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("rawValue").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("f1").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("precision").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("recall").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("truePositiveCount").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("trueNegativeCount").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("falsePositiveCount").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("falseNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("f1").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("precision").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("recall").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
 Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microF1").ToString());
 Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microPrecision").ToString());
 Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microRecall").ToString());
 Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroF1").ToString());
 Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroPrecision").ToString());
 Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroRecall").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("normalizedValue").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("rawValue").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("f1").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("precision").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("recall").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("truePositiveCount").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("trueNegativeCount").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("falsePositiveCount").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("falseNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("f1").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("precision").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("recall").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
 Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microF1").ToString());
 Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microPrecision").ToString());
 Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microRecall").ToString());
 Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("macroF1").ToString());
 Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("macroPrecision").ToString());
 Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("macroRecall").ToString());
-Console.WriteLine(result.GetProperty("evaluationOptions").GetProperty("kind").ToString());
-Console.WriteLine(result.GetProperty("evaluationOptions").GetProperty("trainingSplitPercentage").ToString());
-Console.WriteLine(result.GetProperty("evaluationOptions").GetProperty("testingSplitPercentage").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetModelEvaluationSummaryAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-model-evaluation-summary
+Response response = await client.GetModelEvaluationSummaryAsync("<projectName>", "<trainedModelLabel>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("f1").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("precision").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("recall").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microF1").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microPrecision").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microRecall").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroF1").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroPrecision").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroRecall").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("f1").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("precision").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("recall").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microF1").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microPrecision").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microRecall").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("macroF1").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("macroPrecision").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("macroRecall").ToString());
+Console.WriteLine(result.GetProperty("evaluationOptions").GetProperty("kind").ToString());
+Console.WriteLine(result.GetProperty("evaluationOptions").GetProperty("trainingSplitPercentage").ToString());
+Console.WriteLine(result.GetProperty("evaluationOptions").GetProperty("testingSplitPercentage").ToString());
+]]></code></example>
     </member>
     <member name="GetModelEvaluationSummary(string,string,RequestContext)">
-<example>
-This sample shows how to call GetModelEvaluationSummary with required parameters and parse the result.
+      <example>
+This sample shows how to call GetModelEvaluationSummary and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = client.GetModelEvaluationSummary("<projectName>", "<trainedModelLabel>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("normalizedValue").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("rawValue").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("f1").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("precision").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("recall").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("truePositiveCount").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("trueNegativeCount").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("falsePositiveCount").ToString());
-Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("falseNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("f1").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("precision").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("recall").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
 Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microF1").ToString());
 Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microPrecision").ToString());
 Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microRecall").ToString());
 Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroF1").ToString());
 Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroPrecision").ToString());
 Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroRecall").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("normalizedValue").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("rawValue").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("f1").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("precision").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("recall").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("truePositiveCount").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("trueNegativeCount").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("falsePositiveCount").ToString());
-Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("falseNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("f1").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("precision").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("recall").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
 Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microF1").ToString());
 Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microPrecision").ToString());
 Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microRecall").ToString());
 Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("macroF1").ToString());
 Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("macroPrecision").ToString());
 Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("macroRecall").ToString());
-Console.WriteLine(result.GetProperty("evaluationOptions").GetProperty("kind").ToString());
-Console.WriteLine(result.GetProperty("evaluationOptions").GetProperty("trainingSplitPercentage").ToString());
-Console.WriteLine(result.GetProperty("evaluationOptions").GetProperty("testingSplitPercentage").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetModelEvaluationSummary with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-model-evaluation-summary
+Response response = client.GetModelEvaluationSummary("<projectName>", "<trainedModelLabel>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("f1").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("precision").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("recall").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microF1").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microPrecision").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microRecall").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroF1").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroPrecision").ToString());
+Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroRecall").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("f1").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("precision").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("recall").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microF1").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microPrecision").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microRecall").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("macroF1").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("macroPrecision").ToString());
+Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("macroRecall").ToString());
+Console.WriteLine(result.GetProperty("evaluationOptions").GetProperty("kind").ToString());
+Console.WriteLine(result.GetProperty("evaluationOptions").GetProperty("trainingSplitPercentage").ToString());
+Console.WriteLine(result.GetProperty("evaluationOptions").GetProperty("testingSplitPercentage").ToString());
+]]></code></example>
     </member>
     <member name="GetLoadSnapshotJobStatusAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetLoadSnapshotJobStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLoadSnapshotJobStatusAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = await client.GetLoadSnapshotJobStatusAsync("<projectName>", "<trainedModelLabel>", "<jobId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call GetLoadSnapshotJobStatusAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = await client.GetLoadSnapshotJobStatusAsync("<projectName>", "<trainedModelLabel>", "<jobId>");
 
@@ -791,28 +967,35 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-load-snapshot-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetLoadSnapshotJobStatus(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetLoadSnapshotJobStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLoadSnapshotJobStatus and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = client.GetLoadSnapshotJobStatus("<projectName>", "<trainedModelLabel>", "<jobId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call GetLoadSnapshotJobStatus with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = client.GetLoadSnapshotJobStatus("<projectName>", "<trainedModelLabel>", "<jobId>");
 
@@ -832,37 +1015,48 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-load-snapshot-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetTrainingJobStatusAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetTrainingJobStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTrainingJobStatusAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = await client.GetTrainingJobStatusAsync("<projectName>", "<jobId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
 Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
-Console.WriteLine(result.GetProperty("result").GetProperty("trainingMode").ToString());
 Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
-Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("startDateTime").ToString());
+Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call GetTrainingJobStatusAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = await client.GetTrainingJobStatusAsync("<projectName>", "<jobId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
+Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
+Console.WriteLine(result.GetProperty("result").GetProperty("trainingMode").ToString());
+Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
+Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("startDateTime").ToString());
 Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("endDateTime").ToString());
 Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("percentComplete").ToString());
@@ -885,28 +1079,39 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-training-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetTrainingJobStatus(string,string,RequestContext)">
-<example>
-This sample shows how to call GetTrainingJobStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTrainingJobStatus and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = client.GetTrainingJobStatus("<projectName>", "<jobId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
+Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
+Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
+Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call GetTrainingJobStatus with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = client.GetTrainingJobStatus("<projectName>", "<jobId>");
 
@@ -938,28 +1143,35 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-training-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetProjectDeletionJobStatusAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetProjectDeletionJobStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetProjectDeletionJobStatusAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = await client.GetProjectDeletionJobStatusAsync("<jobId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call GetProjectDeletionJobStatusAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = await client.GetProjectDeletionJobStatusAsync("<jobId>");
 
@@ -979,28 +1191,35 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-project-deletion-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetProjectDeletionJobStatus(string,RequestContext)">
-<example>
-This sample shows how to call GetProjectDeletionJobStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetProjectDeletionJobStatus and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Response response = client.GetProjectDeletionJobStatus("<jobId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call GetProjectDeletionJobStatus with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
 Response response = client.GetProjectDeletionJobStatus("<jobId>");
 
@@ -1020,584 +1239,672 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-project-deletion-status
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetProjectsAsync(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetProjectsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetProjectsAsync())
+await foreach (BinaryData item in client.GetProjectsAsync())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("projectKind").ToString());
-    Console.WriteLine(result.GetProperty("settings").GetProperty("confidenceThreshold").ToString());
-    Console.WriteLine(result.GetProperty("projectName").ToString());
-    Console.WriteLine(result.GetProperty("multilingual").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("language").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("projectKind").ToString());
+    Console.WriteLine(result[0].GetProperty("projectName").ToString());
+    Console.WriteLine(result[0].GetProperty("language").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/list-projects
+This sample shows how to call GetProjectsAsync with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+await foreach (BinaryData item in client.GetProjectsAsync())
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("projectKind").ToString());
+    Console.WriteLine(result[0].GetProperty("settings").GetProperty("confidenceThreshold").ToString());
+    Console.WriteLine(result[0].GetProperty("projectName").ToString());
+    Console.WriteLine(result[0].GetProperty("multilingual").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("language").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetProjects(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetProjects and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetProjects())
+foreach (BinaryData item in client.GetProjects())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("projectKind").ToString());
-    Console.WriteLine(result.GetProperty("settings").GetProperty("confidenceThreshold").ToString());
-    Console.WriteLine(result.GetProperty("projectName").ToString());
-    Console.WriteLine(result.GetProperty("multilingual").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("language").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("projectKind").ToString());
+    Console.WriteLine(result[0].GetProperty("projectName").ToString());
+    Console.WriteLine(result[0].GetProperty("language").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/list-projects
+This sample shows how to call GetProjects with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+foreach (BinaryData item in client.GetProjects())
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("projectKind").ToString());
+    Console.WriteLine(result[0].GetProperty("settings").GetProperty("confidenceThreshold").ToString());
+    Console.WriteLine(result[0].GetProperty("projectName").ToString());
+    Console.WriteLine(result[0].GetProperty("multilingual").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("language").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetDeploymentsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetDeploymentsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeploymentsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetDeploymentsAsync("<projectName>"))
+await foreach (BinaryData item in client.GetDeploymentsAsync("<projectName>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deploymentName").ToString());
-    Console.WriteLine(result.GetProperty("modelId").ToString());
-    Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("deploymentExpirationDate").ToString());
-    Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentName").ToString());
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentExpirationDate").ToString());
+    Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/list-deployments
+This sample shows how to call GetDeploymentsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+await foreach (BinaryData item in client.GetDeploymentsAsync("<projectName>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("deploymentName").ToString());
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentExpirationDate").ToString());
+    Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetDeployments(string,RequestContext)">
-<example>
-This sample shows how to call GetDeployments with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeployments and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetDeployments("<projectName>"))
+foreach (BinaryData item in client.GetDeployments("<projectName>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deploymentName").ToString());
-    Console.WriteLine(result.GetProperty("modelId").ToString());
-    Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("deploymentExpirationDate").ToString());
-    Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentName").ToString());
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentExpirationDate").ToString());
+    Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/list-deployments
+This sample shows how to call GetDeployments with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+foreach (BinaryData item in client.GetDeployments("<projectName>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("deploymentName").ToString());
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentExpirationDate").ToString());
+    Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetTrainedModelsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetTrainedModelsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTrainedModelsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetTrainedModelsAsync("<projectName>"))
+await foreach (BinaryData item in client.GetTrainedModelsAsync("<projectName>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("label").ToString());
-    Console.WriteLine(result.GetProperty("modelId").ToString());
-    Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastTrainingDurationInSeconds").ToString());
-    Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
-    Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
-    Console.WriteLine(result.GetProperty("hasSnapshot").ToString());
+    Console.WriteLine(result[0].GetProperty("label").ToString());
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastTrainingDurationInSeconds").ToString());
+    Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
+    Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("hasSnapshot").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/list-trained-models
+This sample shows how to call GetTrainedModelsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+await foreach (BinaryData item in client.GetTrainedModelsAsync("<projectName>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("label").ToString());
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastTrainingDurationInSeconds").ToString());
+    Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
+    Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("hasSnapshot").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetTrainedModels(string,RequestContext)">
-<example>
-This sample shows how to call GetTrainedModels with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTrainedModels and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetTrainedModels("<projectName>"))
+foreach (BinaryData item in client.GetTrainedModels("<projectName>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("label").ToString());
-    Console.WriteLine(result.GetProperty("modelId").ToString());
-    Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastTrainingDurationInSeconds").ToString());
-    Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
-    Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
-    Console.WriteLine(result.GetProperty("hasSnapshot").ToString());
+    Console.WriteLine(result[0].GetProperty("label").ToString());
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastTrainingDurationInSeconds").ToString());
+    Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
+    Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("hasSnapshot").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/list-trained-models
+This sample shows how to call GetTrainedModels with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+foreach (BinaryData item in client.GetTrainedModels("<projectName>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("label").ToString());
+    Console.WriteLine(result[0].GetProperty("modelId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastTrainingDurationInSeconds").ToString());
+    Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
+    Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("hasSnapshot").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetModelEvaluationResultsAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetModelEvaluationResultsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetModelEvaluationResultsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetModelEvaluationResultsAsync("<projectName>", "<trainedModelLabel>"))
+await foreach (BinaryData item in client.GetModelEvaluationResultsAsync("<projectName>", "<trainedModelLabel>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("text").ToString());
-    Console.WriteLine(result.GetProperty("language").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
-    Console.WriteLine(result.GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
-    Console.WriteLine(result.GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
+    Console.WriteLine(result[0].GetProperty("text").ToString());
+    Console.WriteLine(result[0].GetProperty("language").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
+    Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
+    Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
 }
 ]]></code>
-This sample shows how to call GetModelEvaluationResultsAsync with all parameters, and how to parse the result.
+This sample shows how to call GetModelEvaluationResultsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetModelEvaluationResultsAsync("<projectName>", "<trainedModelLabel>", "Utf16CodeUnit"))
+await foreach (BinaryData item in client.GetModelEvaluationResultsAsync("<projectName>", "<trainedModelLabel>", stringIndexType: "Utf16CodeUnit"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("text").ToString());
-    Console.WriteLine(result.GetProperty("language").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
-    Console.WriteLine(result.GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
-    Console.WriteLine(result.GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
+    Console.WriteLine(result[0].GetProperty("text").ToString());
+    Console.WriteLine(result[0].GetProperty("language").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
+    Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
+    Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
 }
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-model-evaluation-results
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetModelEvaluationResults(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetModelEvaluationResults with required parameters and parse the result.
+      <example>
+This sample shows how to call GetModelEvaluationResults and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetModelEvaluationResults("<projectName>", "<trainedModelLabel>"))
+foreach (BinaryData item in client.GetModelEvaluationResults("<projectName>", "<trainedModelLabel>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("text").ToString());
-    Console.WriteLine(result.GetProperty("language").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
-    Console.WriteLine(result.GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
-    Console.WriteLine(result.GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
+    Console.WriteLine(result[0].GetProperty("text").ToString());
+    Console.WriteLine(result[0].GetProperty("language").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
+    Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
+    Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
 }
 ]]></code>
-This sample shows how to call GetModelEvaluationResults with all parameters, and how to parse the result.
+This sample shows how to call GetModelEvaluationResults with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetModelEvaluationResults("<projectName>", "<trainedModelLabel>", "Utf16CodeUnit"))
+foreach (BinaryData item in client.GetModelEvaluationResults("<projectName>", "<trainedModelLabel>", stringIndexType: "Utf16CodeUnit"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("text").ToString());
-    Console.WriteLine(result.GetProperty("language").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
-    Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
-    Console.WriteLine(result.GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
-    Console.WriteLine(result.GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
+    Console.WriteLine(result[0].GetProperty("text").ToString());
+    Console.WriteLine(result[0].GetProperty("language").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
+    Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
+    Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
+    Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
 }
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-model-evaluation-results
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetTrainingJobsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetTrainingJobsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTrainingJobsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetTrainingJobsAsync("<projectName>"))
+await foreach (BinaryData item in client.GetTrainingJobsAsync("<projectName>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("trainingMode").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("startDateTime").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("endDateTime").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("percentComplete").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("startDateTime").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("endDateTime").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("estimatedEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("jobId").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("warnings")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("warnings")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("modelLabel").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingConfigVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("jobId").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastUpdatedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/list-training-jobs
+This sample shows how to call GetTrainingJobsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+await foreach (BinaryData item in client.GetTrainingJobsAsync("<projectName>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("modelLabel").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingConfigVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingMode").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("startDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("endDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("percentComplete").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("startDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("endDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("estimatedEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("jobId").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastUpdatedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("expirationDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("warnings")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("warnings")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetTrainingJobs(string,RequestContext)">
-<example>
-This sample shows how to call GetTrainingJobs with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTrainingJobs and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetTrainingJobs("<projectName>"))
+foreach (BinaryData item in client.GetTrainingJobs("<projectName>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("trainingMode").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("startDateTime").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("endDateTime").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("percentComplete").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("startDateTime").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("endDateTime").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("result").GetProperty("estimatedEndDateTime").ToString());
-    Console.WriteLine(result.GetProperty("jobId").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("warnings")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("warnings")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("modelLabel").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingConfigVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("jobId").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastUpdatedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/list-training-jobs
+This sample shows how to call GetTrainingJobs with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+foreach (BinaryData item in client.GetTrainingJobs("<projectName>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("modelLabel").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingConfigVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingMode").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("startDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("endDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("percentComplete").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("startDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("endDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("result").GetProperty("estimatedEndDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("jobId").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastUpdatedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("expirationDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("warnings")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("warnings")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSupportedLanguagesAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetSupportedLanguagesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSupportedLanguagesAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetSupportedLanguagesAsync("<projectKind>"))
+await foreach (BinaryData item in client.GetSupportedLanguagesAsync("Conversation"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("languageName").ToString());
-    Console.WriteLine(result.GetProperty("languageCode").ToString());
+    Console.WriteLine(result[0].GetProperty("languageName").ToString());
+    Console.WriteLine(result[0].GetProperty("languageCode").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-supported-languages
+This sample shows how to call GetSupportedLanguagesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+await foreach (BinaryData item in client.GetSupportedLanguagesAsync("Conversation"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("languageName").ToString());
+    Console.WriteLine(result[0].GetProperty("languageCode").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSupportedLanguages(string,RequestContext)">
-<example>
-This sample shows how to call GetSupportedLanguages with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSupportedLanguages and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetSupportedLanguages("<projectKind>"))
+foreach (BinaryData item in client.GetSupportedLanguages("Conversation"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("languageName").ToString());
-    Console.WriteLine(result.GetProperty("languageCode").ToString());
+    Console.WriteLine(result[0].GetProperty("languageName").ToString());
+    Console.WriteLine(result[0].GetProperty("languageCode").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-supported-languages
+This sample shows how to call GetSupportedLanguages with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+foreach (BinaryData item in client.GetSupportedLanguages("Conversation"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("languageName").ToString());
+    Console.WriteLine(result[0].GetProperty("languageCode").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSupportedPrebuiltEntitiesAsync(string,bool?,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetSupportedPrebuiltEntitiesAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetSupportedPrebuiltEntitiesAsync())
+await foreach (BinaryData item in client.GetSupportedPrebuiltEntitiesAsync())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("category").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("examples").ToString());
+    Console.WriteLine(result[0].GetProperty("category").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("examples").ToString());
 }
 ]]></code>
-This sample shows how to call GetSupportedPrebuiltEntitiesAsync with all parameters, and how to parse the result.
+This sample shows how to call GetSupportedPrebuiltEntitiesAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetSupportedPrebuiltEntitiesAsync("<language>", true))
+await foreach (BinaryData item in client.GetSupportedPrebuiltEntitiesAsync(language: "<language>", multilingual: true))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("category").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("examples").ToString());
+    Console.WriteLine(result[0].GetProperty("category").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("examples").ToString());
 }
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-supported-prebuilt-entities
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetSupportedPrebuiltEntities(string,bool?,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetSupportedPrebuiltEntities and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetSupportedPrebuiltEntities())
+foreach (BinaryData item in client.GetSupportedPrebuiltEntities())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("category").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("examples").ToString());
+    Console.WriteLine(result[0].GetProperty("category").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("examples").ToString());
 }
 ]]></code>
-This sample shows how to call GetSupportedPrebuiltEntities with all parameters, and how to parse the result.
+This sample shows how to call GetSupportedPrebuiltEntities with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetSupportedPrebuiltEntities("<language>", true))
+foreach (BinaryData item in client.GetSupportedPrebuiltEntities(language: "<language>", multilingual: true))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("category").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("examples").ToString());
+    Console.WriteLine(result[0].GetProperty("category").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("examples").ToString());
 }
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/get-supported-prebuilt-entities
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetTrainingConfigVersionsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetTrainingConfigVersionsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTrainingConfigVersionsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetTrainingConfigVersionsAsync("<projectKind>"))
+await foreach (BinaryData item in client.GetTrainingConfigVersionsAsync("Conversation"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("trainingConfigVersion").ToString());
-    Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
+    Console.WriteLine(result[0].GetProperty("trainingConfigVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/list-training-config-versions
+This sample shows how to call GetTrainingConfigVersionsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+await foreach (BinaryData item in client.GetTrainingConfigVersionsAsync("Conversation"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("trainingConfigVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetTrainingConfigVersions(string,RequestContext)">
-<example>
-This sample shows how to call GetTrainingConfigVersions with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTrainingConfigVersions and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetTrainingConfigVersions("<projectKind>"))
+foreach (BinaryData item in client.GetTrainingConfigVersions("Conversation"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("trainingConfigVersion").ToString());
-    Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
+    Console.WriteLine(result[0].GetProperty("trainingConfigVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/list-training-config-versions
+This sample shows how to call GetTrainingConfigVersions with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+foreach (BinaryData item in client.GetTrainingConfigVersions("Conversation"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("trainingConfigVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
+}
+]]></code></example>
     </member>
     <member name="DeleteProjectAsync(WaitUntil,string,RequestContext)">
-<example>
-This sample shows how to call DeleteProjectAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteProjectAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-var operation = await client.DeleteProjectAsync(WaitUntil.Completed, "<projectName>");
+Operation<BinaryData> operation = await client.DeleteProjectAsync(WaitUntil.Completed, "<projectName>");
+BinaryData responseData = operation.Value;
+
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call DeleteProjectAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+Operation<BinaryData> operation = await client.DeleteProjectAsync(WaitUntil.Completed, "<projectName>");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -1614,32 +1921,40 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/delete-project
-
-</remarks>
+]]></code></example>
     </member>
     <member name="DeleteProject(WaitUntil,string,RequestContext)">
-<example>
-This sample shows how to call DeleteProject with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteProject and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-var operation = client.DeleteProject(WaitUntil.Completed, "<projectName>");
+Operation<BinaryData> operation = client.DeleteProject(WaitUntil.Completed, "<projectName>");
+BinaryData responseData = operation.Value;
+
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call DeleteProject with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+Operation<BinaryData> operation = client.DeleteProject(WaitUntil.Completed, "<projectName>");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -1656,44 +1971,37 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/delete-project
-
-</remarks>
+]]></code></example>
     </member>
     <member name="ExportProjectAsync(WaitUntil,string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call ExportProjectAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call ExportProjectAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var operation = await client.ExportProjectAsync(WaitUntil.Completed, "<projectName>");
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+Operation<BinaryData> operation = await client.ExportProjectAsync(WaitUntil.Completed, "<projectName>");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call ExportProjectAsync with all parameters, and how to parse the result.
+This sample shows how to call ExportProjectAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var operation = await client.ExportProjectAsync(WaitUntil.Completed, "<projectName>", "<exportedProjectFormat>", "<assetKind>", "Utf16CodeUnit", "<trainedModelLabel>");
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+Operation<BinaryData> operation = await client.ExportProjectAsync(WaitUntil.Completed, "<projectName>", exportedProjectFormat: "Conversation", assetKind: "<assetKind>", stringIndexType: "Utf16CodeUnit", trainedModelLabel: "<trainedModelLabel>");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("resultUrl").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
@@ -1711,44 +2019,37 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/export
-
-</remarks>
+]]></code></example>
     </member>
     <member name="ExportProject(WaitUntil,string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call ExportProject with required parameters and parse the result.
+      <example>
+This sample shows how to call ExportProject and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var operation = client.ExportProject(WaitUntil.Completed, "<projectName>");
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+Operation<BinaryData> operation = client.ExportProject(WaitUntil.Completed, "<projectName>");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call ExportProject with all parameters, and how to parse the result.
+This sample shows how to call ExportProject with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var operation = client.ExportProject(WaitUntil.Completed, "<projectName>", "<exportedProjectFormat>", "<assetKind>", "Utf16CodeUnit", "<trainedModelLabel>");
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+Operation<BinaryData> operation = client.ExportProject(WaitUntil.Completed, "<projectName>", exportedProjectFormat: "Conversation", assetKind: "<assetKind>", stringIndexType: "Utf16CodeUnit", trainedModelLabel: "<trainedModelLabel>");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("resultUrl").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
@@ -1766,133 +2067,150 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/export
-
-</remarks>
+]]></code></example>
     </member>
     <member name="ImportProjectAsync(WaitUntil,string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call ImportProjectAsync with required parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var data = new {
-    projectFileVersion = "<projectFileVersion>",
-    stringIndexType = "Utf16CodeUnit",
-    metadata = new {
-        projectKind = "Conversation",
-        projectName = "<projectName>",
-        language = "<language>",
-    },
-};
-
-var operation = await client.ImportProjectAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+      <example>
+This sample shows how to call ImportProjectAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["projectFileVersion"] = "<projectFileVersion>",
+    ["stringIndexType"] = "Utf16CodeUnit",
+    ["metadata"] = new Dictionary<string, object>()
+    {
+        ["projectKind"] = "Conversation",
+        ["projectName"] = "<projectName>",
+        ["language"] = "<language>",
+    },
+});
+Operation<BinaryData> operation = await client.ImportProjectAsync(WaitUntil.Completed, "<projectName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call ImportProjectAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var data = new {
-    projectFileVersion = "<projectFileVersion>",
-    stringIndexType = "Utf16CodeUnit",
-    metadata = new {
-        projectKind = "Conversation",
-        settings = new {
-            confidenceThreshold = 123.45f,
+This sample shows how to call ImportProjectAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["projectFileVersion"] = "<projectFileVersion>",
+    ["stringIndexType"] = "Utf16CodeUnit",
+    ["metadata"] = new Dictionary<string, object>()
+    {
+        ["projectKind"] = "Conversation",
+        ["settings"] = new Dictionary<string, object>()
+        {
+            ["confidenceThreshold"] = 123.45F,
         },
-        projectName = "<projectName>",
-        multilingual = true,
-        description = "<description>",
-        language = "<language>",
+        ["projectName"] = "<projectName>",
+        ["multilingual"] = true,
+        ["description"] = "<description>",
+        ["language"] = "<language>",
     },
-    assets = new {
-        intents = new[] {
-            new {
-                category = "<category>",
-            }
-        },
-        entities = new[] {
-            new {
-                category = "<category>",
-                compositionSetting = "returnLongestOverlap",
-                list = new {
-                    sublists = new[] {
-                        new {
-                            listKey = "<listKey>",
-                            synonyms = new[] {
-                                new {
-                                    language = "<language>",
-                                    values = new[] {
-                                        "<String>"
-                                    },
-                                }
-                            },
-                        }
-                    },
-                },
-                prebuilts = new[] {
-                    new {
-                        category = "<category>",
-                    }
-                },
-                regex = new {
-                    expressions = new[] {
-                        new {
-                            regexKey = "<regexKey>",
-                            language = "<language>",
-                            regexPattern = "<regexPattern>",
-                        }
-                    },
-                },
-                requiredComponents = new[] {
-                    "<String>"
-                },
-            }
-        },
-        utterances = new[] {
-            new {
-                entities = new[] {
-                    new {
-                        category = "<category>",
-                        offset = 1234,
-                        length = 1234,
-                    }
-                },
-                text = "<text>",
-                language = "<language>",
-                intent = "<intent>",
-                dataset = "<dataset>",
-            }
-        },
-        projectKind = "Conversation",
+    ["assets"] = new Dictionary<string, object>()
+    {
+        ["intents"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+}
+},
+        ["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+["compositionSetting"] = "returnLongestOverlap",
+["list"] = new Dictionary<string, object>()
+{
+["sublists"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["listKey"] = "<listKey>",
+["synonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["language"] = "<language>",
+["values"] = new List<object>()
+{
+"<values>"
+},
+}
+},
+}
+},
+},
+["prebuilts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+}
+},
+["regex"] = new Dictionary<string, object>()
+{
+["expressions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["regexKey"] = "<regexKey>",
+["language"] = "<language>",
+["regexPattern"] = "<regexPattern>",
+}
+},
+},
+["requiredComponents"] = new List<object>()
+{
+"<requiredComponents>"
+},
+}
+},
+        ["utterances"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+["offset"] = 1234,
+["length"] = 1234,
+}
+},
+["text"] = "<text>",
+["language"] = "<language>",
+["intent"] = "<intent>",
+["dataset"] = "<dataset>",
+}
+},
+        ["projectKind"] = "Conversation",
     },
-};
-
-var operation = await client.ImportProjectAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data), "<exportedProjectFormat>");
-
+});
+Operation<BinaryData> operation = await client.ImportProjectAsync(WaitUntil.Completed, "<projectName>", content, exportedProjectFormat: "Conversation");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -1909,133 +2227,150 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/import
-
-</remarks>
+]]></code></example>
     </member>
     <member name="ImportProject(WaitUntil,string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call ImportProject with required parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var data = new {
-    projectFileVersion = "<projectFileVersion>",
-    stringIndexType = "Utf16CodeUnit",
-    metadata = new {
-        projectKind = "Conversation",
-        projectName = "<projectName>",
-        language = "<language>",
-    },
-};
-
-var operation = client.ImportProject(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+      <example>
+This sample shows how to call ImportProject and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["projectFileVersion"] = "<projectFileVersion>",
+    ["stringIndexType"] = "Utf16CodeUnit",
+    ["metadata"] = new Dictionary<string, object>()
+    {
+        ["projectKind"] = "Conversation",
+        ["projectName"] = "<projectName>",
+        ["language"] = "<language>",
+    },
+});
+Operation<BinaryData> operation = client.ImportProject(WaitUntil.Completed, "<projectName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call ImportProject with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var data = new {
-    projectFileVersion = "<projectFileVersion>",
-    stringIndexType = "Utf16CodeUnit",
-    metadata = new {
-        projectKind = "Conversation",
-        settings = new {
-            confidenceThreshold = 123.45f,
+This sample shows how to call ImportProject with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["projectFileVersion"] = "<projectFileVersion>",
+    ["stringIndexType"] = "Utf16CodeUnit",
+    ["metadata"] = new Dictionary<string, object>()
+    {
+        ["projectKind"] = "Conversation",
+        ["settings"] = new Dictionary<string, object>()
+        {
+            ["confidenceThreshold"] = 123.45F,
         },
-        projectName = "<projectName>",
-        multilingual = true,
-        description = "<description>",
-        language = "<language>",
+        ["projectName"] = "<projectName>",
+        ["multilingual"] = true,
+        ["description"] = "<description>",
+        ["language"] = "<language>",
     },
-    assets = new {
-        intents = new[] {
-            new {
-                category = "<category>",
-            }
-        },
-        entities = new[] {
-            new {
-                category = "<category>",
-                compositionSetting = "returnLongestOverlap",
-                list = new {
-                    sublists = new[] {
-                        new {
-                            listKey = "<listKey>",
-                            synonyms = new[] {
-                                new {
-                                    language = "<language>",
-                                    values = new[] {
-                                        "<String>"
-                                    },
-                                }
-                            },
-                        }
-                    },
-                },
-                prebuilts = new[] {
-                    new {
-                        category = "<category>",
-                    }
-                },
-                regex = new {
-                    expressions = new[] {
-                        new {
-                            regexKey = "<regexKey>",
-                            language = "<language>",
-                            regexPattern = "<regexPattern>",
-                        }
-                    },
-                },
-                requiredComponents = new[] {
-                    "<String>"
-                },
-            }
-        },
-        utterances = new[] {
-            new {
-                entities = new[] {
-                    new {
-                        category = "<category>",
-                        offset = 1234,
-                        length = 1234,
-                    }
-                },
-                text = "<text>",
-                language = "<language>",
-                intent = "<intent>",
-                dataset = "<dataset>",
-            }
-        },
-        projectKind = "Conversation",
+    ["assets"] = new Dictionary<string, object>()
+    {
+        ["intents"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+}
+},
+        ["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+["compositionSetting"] = "returnLongestOverlap",
+["list"] = new Dictionary<string, object>()
+{
+["sublists"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["listKey"] = "<listKey>",
+["synonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["language"] = "<language>",
+["values"] = new List<object>()
+{
+"<values>"
+},
+}
+},
+}
+},
+},
+["prebuilts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+}
+},
+["regex"] = new Dictionary<string, object>()
+{
+["expressions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["regexKey"] = "<regexKey>",
+["language"] = "<language>",
+["regexPattern"] = "<regexPattern>",
+}
+},
+},
+["requiredComponents"] = new List<object>()
+{
+"<requiredComponents>"
+},
+}
+},
+        ["utterances"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+["offset"] = 1234,
+["length"] = 1234,
+}
+},
+["text"] = "<text>",
+["language"] = "<language>",
+["intent"] = "<intent>",
+["dataset"] = "<dataset>",
+}
+},
+        ["projectKind"] = "Conversation",
     },
-};
-
-var operation = client.ImportProject(WaitUntil.Completed, "<projectName>", RequestContent.Create(data), "<exportedProjectFormat>");
-
+});
+Operation<BinaryData> operation = client.ImportProject(WaitUntil.Completed, "<projectName>", content, exportedProjectFormat: "Conversation");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2052,37 +2387,30 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/import
-
-</remarks>
+]]></code></example>
     </member>
     <member name="TrainAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call TrainAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call TrainAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var data = new {
-    modelLabel = "<modelLabel>",
-    trainingMode = "advanced",
-};
-
-var operation = await client.TrainAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["modelLabel"] = "<modelLabel>",
+    ["trainingMode"] = "advanced",
+});
+Operation<BinaryData> operation = await client.TrainAsync(WaitUntil.Completed, "<projectName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
 Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
@@ -2093,26 +2421,27 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call TrainAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var data = new {
-    modelLabel = "<modelLabel>",
-    trainingConfigVersion = "<trainingConfigVersion>",
-    trainingMode = "advanced",
-    evaluationOptions = new {
-        kind = "percentage",
-        trainingSplitPercentage = 1234,
-        testingSplitPercentage = 1234,
-    },
-};
-
-var operation = await client.TrainAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+This sample shows how to call TrainAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["modelLabel"] = "<modelLabel>",
+    ["trainingConfigVersion"] = "<trainingConfigVersion>",
+    ["trainingMode"] = "advanced",
+    ["evaluationOptions"] = new Dictionary<string, object>()
+    {
+        ["kind"] = "percentage",
+        ["trainingSplitPercentage"] = 1234,
+        ["testingSplitPercentage"] = 1234,
+    },
+});
+Operation<BinaryData> operation = await client.TrainAsync(WaitUntil.Completed, "<projectName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
 Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
@@ -2141,37 +2470,30 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/train
-
-</remarks>
+]]></code></example>
     </member>
     <member name="Train(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call Train with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call Train and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var data = new {
-    modelLabel = "<modelLabel>",
-    trainingMode = "advanced",
-};
-
-var operation = client.Train(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["modelLabel"] = "<modelLabel>",
+    ["trainingMode"] = "advanced",
+});
+Operation<BinaryData> operation = client.Train(WaitUntil.Completed, "<projectName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
 Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
@@ -2182,26 +2504,27 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call Train with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var data = new {
-    modelLabel = "<modelLabel>",
-    trainingConfigVersion = "<trainingConfigVersion>",
-    trainingMode = "advanced",
-    evaluationOptions = new {
-        kind = "percentage",
-        trainingSplitPercentage = 1234,
-        testingSplitPercentage = 1234,
-    },
-};
-
-var operation = client.Train(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+This sample shows how to call Train with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["modelLabel"] = "<modelLabel>",
+    ["trainingConfigVersion"] = "<trainingConfigVersion>",
+    ["trainingMode"] = "advanced",
+    ["evaluationOptions"] = new Dictionary<string, object>()
+    {
+        ["kind"] = "percentage",
+        ["trainingSplitPercentage"] = 1234,
+        ["testingSplitPercentage"] = 1234,
+    },
+});
+Operation<BinaryData> operation = client.Train(WaitUntil.Completed, "<projectName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
 Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
@@ -2230,37 +2553,50 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/train
-
-</remarks>
+]]></code></example>
     </member>
     <member name="SwapDeploymentsAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call SwapDeploymentsAsync with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call SwapDeploymentsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-var data = new {
-    firstDeploymentName = "<firstDeploymentName>",
-    secondDeploymentName = "<secondDeploymentName>",
-};
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["firstDeploymentName"] = "<firstDeploymentName>",
+    ["secondDeploymentName"] = "<secondDeploymentName>",
+});
+Operation<BinaryData> operation = await client.SwapDeploymentsAsync(WaitUntil.Completed, "<projectName>", content);
+BinaryData responseData = operation.Value;
 
-var operation = await client.SwapDeploymentsAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call SwapDeploymentsAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["firstDeploymentName"] = "<firstDeploymentName>",
+    ["secondDeploymentName"] = "<secondDeploymentName>",
+});
+Operation<BinaryData> operation = await client.SwapDeploymentsAsync(WaitUntil.Completed, "<projectName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2277,37 +2613,50 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/swap-deployments
-
-</remarks>
+]]></code></example>
     </member>
     <member name="SwapDeployments(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call SwapDeployments with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call SwapDeployments and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-var data = new {
-    firstDeploymentName = "<firstDeploymentName>",
-    secondDeploymentName = "<secondDeploymentName>",
-};
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["firstDeploymentName"] = "<firstDeploymentName>",
+    ["secondDeploymentName"] = "<secondDeploymentName>",
+});
+Operation<BinaryData> operation = client.SwapDeployments(WaitUntil.Completed, "<projectName>", content);
+BinaryData responseData = operation.Value;
 
-var operation = client.SwapDeployments(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call SwapDeployments with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["firstDeploymentName"] = "<firstDeploymentName>",
+    ["secondDeploymentName"] = "<secondDeploymentName>",
+});
+Operation<BinaryData> operation = client.SwapDeployments(WaitUntil.Completed, "<projectName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2324,36 +2673,29 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/swap-deployments
-
-</remarks>
+]]></code></example>
     </member>
     <member name="DeployProjectAsync(WaitUntil,string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DeployProjectAsync with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call DeployProjectAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var data = new {
-    trainedModelLabel = "<trainedModelLabel>",
-};
-
-var operation = await client.DeployProjectAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["trainedModelLabel"] = "<trainedModelLabel>",
+});
+Operation<BinaryData> operation = await client.DeployProjectAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("deploymentName").ToString());
 Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -2362,29 +2704,43 @@ Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
 Console.WriteLine(result.GetProperty("deploymentExpirationDate").ToString());
 Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call DeployProjectAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/deploy-project
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["trainedModelLabel"] = "<trainedModelLabel>",
+});
+Operation<BinaryData> operation = await client.DeployProjectAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>", content);
+BinaryData responseData = operation.Value;
 
-</remarks>
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("deploymentName").ToString());
+Console.WriteLine(result.GetProperty("modelId").ToString());
+Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+Console.WriteLine(result.GetProperty("deploymentExpirationDate").ToString());
+Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
+]]></code></example>
     </member>
     <member name="DeployProject(WaitUntil,string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DeployProject with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call DeployProject and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var data = new {
-    trainedModelLabel = "<trainedModelLabel>",
-};
-
-var operation = client.DeployProject(WaitUntil.Completed, "<projectName>", "<deploymentName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["trainedModelLabel"] = "<trainedModelLabel>",
+});
+Operation<BinaryData> operation = client.DeployProject(WaitUntil.Completed, "<projectName>", "<deploymentName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("deploymentName").ToString());
 Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -2393,25 +2749,54 @@ Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
 Console.WriteLine(result.GetProperty("deploymentExpirationDate").ToString());
 Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call DeployProject with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/deploy-project
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["trainedModelLabel"] = "<trainedModelLabel>",
+});
+Operation<BinaryData> operation = client.DeployProject(WaitUntil.Completed, "<projectName>", "<deploymentName>", content);
+BinaryData responseData = operation.Value;
 
-</remarks>
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("deploymentName").ToString());
+Console.WriteLine(result.GetProperty("modelId").ToString());
+Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+Console.WriteLine(result.GetProperty("deploymentExpirationDate").ToString());
+Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
+]]></code></example>
     </member>
     <member name="DeleteDeploymentAsync(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteDeploymentAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteDeploymentAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Operation<BinaryData> operation = await client.DeleteDeploymentAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+BinaryData responseData = operation.Value;
 
-var operation = await client.DeleteDeploymentAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call DeleteDeploymentAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+Operation<BinaryData> operation = await client.DeleteDeploymentAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2428,32 +2813,40 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/delete-deployment
-
-</remarks>
+]]></code></example>
     </member>
     <member name="DeleteDeployment(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteDeployment with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteDeployment and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-var operation = client.DeleteDeployment(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+Operation<BinaryData> operation = client.DeleteDeployment(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call DeleteDeployment with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Operation<BinaryData> operation = client.DeleteDeployment(WaitUntil.Completed, "<projectName>", "<deploymentName>");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2470,72 +2863,82 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/delete-deployment
-
-</remarks>
+]]></code></example>
     </member>
     <member name="LoadSnapshotAsync(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call LoadSnapshotAsync with required parameters.
+      <example>
+This sample shows how to call LoadSnapshotAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var operation = await client.LoadSnapshotAsync(WaitUntil.Completed, "<projectName>", "<trainedModelLabel>");
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = await client.LoadSnapshotAsync(WaitUntil.Completed, "<projectName>", "<trainedModelLabel>");
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/load-snapshot
+This sample shows how to call LoadSnapshotAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+Operation operation = await client.LoadSnapshotAsync(WaitUntil.Completed, "<projectName>", "<trainedModelLabel>");
+]]></code></example>
     </member>
     <member name="LoadSnapshot(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call LoadSnapshot with required parameters.
+      <example>
+This sample shows how to call LoadSnapshot.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
-
-var operation = client.LoadSnapshot(WaitUntil.Completed, "<projectName>", "<trainedModelLabel>");
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = client.LoadSnapshot(WaitUntil.Completed, "<projectName>", "<trainedModelLabel>");
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/load-snapshot
+This sample shows how to call LoadSnapshot with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-</remarks>
+Operation operation = client.LoadSnapshot(WaitUntil.Completed, "<projectName>", "<trainedModelLabel>");
+]]></code></example>
     </member>
     <member name="CancelTrainingJobAsync(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call CancelTrainingJobAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CancelTrainingJobAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-var operation = await client.CancelTrainingJobAsync(WaitUntil.Completed, "<projectName>", "<jobId>");
+Operation<BinaryData> operation = await client.CancelTrainingJobAsync(WaitUntil.Completed, "<projectName>", "<jobId>");
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
+Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
+Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
+Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call CancelTrainingJobAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Operation<BinaryData> operation = await client.CancelTrainingJobAsync(WaitUntil.Completed, "<projectName>", "<jobId>");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
 Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
@@ -2564,32 +2967,44 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/cancel-training-job
-
-</remarks>
+]]></code></example>
     </member>
     <member name="CancelTrainingJob(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call CancelTrainingJob with required parameters and parse the result.
+      <example>
+This sample shows how to call CancelTrainingJob and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConversationAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-var operation = client.CancelTrainingJob(WaitUntil.Completed, "<projectName>", "<jobId>");
+Operation<BinaryData> operation = client.CancelTrainingJob(WaitUntil.Completed, "<projectName>", "<jobId>");
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
+Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
+Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
+Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call CancelTrainingJob with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
+
+Operation<BinaryData> operation = client.CancelTrainingJob(WaitUntil.Completed, "<projectName>", "<jobId>");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
 Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
@@ -2618,20 +3033,13 @@ Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetP
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/language/2023-04-01/conversational-analysis-authoring/cancel-training-job
-
-</remarks>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Conversations/tests/Generated/Samples/Samples_ConversationAnalysisClient.cs b/sdk/cognitivelanguage/Azure.AI.Language.Conversations/tests/Generated/Samples/Samples_ConversationAnalysisClient.cs
index def7c2f6b94c..a719f1780996 100644
--- a/sdk/cognitivelanguage/Azure.AI.Language.Conversations/tests/Generated/Samples/Samples_ConversationAnalysisClient.cs
+++ b/sdk/cognitivelanguage/Azure.AI.Language.Conversations/tests/Generated/Samples/Samples_ConversationAnalysisClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.AI.Language.Conversations;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,30 +23,28 @@ public class Samples_ConversationAnalysisClient
         [Ignore("Only validating compilation of examples")]
         public void Example_AnalyzeConversation()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                analysisInput = new
+                ["analysisInput"] = new Dictionary<string, object>()
                 {
-                    conversationItem = new
+                    ["conversationItem"] = new Dictionary<string, object>()
                     {
-                        text = "<text>",
-                        id = "<id>",
-                        participantId = "<participantId>",
+                        ["id"] = "<id>",
+                        ["participantId"] = "<participantId>",
                     },
                 },
-                parameters = new
+                ["parameters"] = new Dictionary<string, object>()
                 {
-                    projectName = "<projectName>",
-                    deploymentName = "<deploymentName>",
+                    ["projectName"] = "<projectName>",
+                    ["deploymentName"] = "<deploymentName>",
                 },
-                kind = "Conversation",
-            };
-
-            Response response = client.AnalyzeConversation(RequestContent.Create(data));
+                ["kind"] = "Conversation",
+            });
+            Response response = client.AnalyzeConversation(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -56,55 +54,53 @@ public void Example_AnalyzeConversation()
         [Ignore("Only validating compilation of examples")]
         public void Example_AnalyzeConversation_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                analysisInput = new
+                ["analysisInput"] = new Dictionary<string, object>()
                 {
-                    conversationItem = new
+                    ["conversationItem"] = new Dictionary<string, object>()
                     {
-                        text = "<text>",
-                        id = "<id>",
-                        participantId = "<participantId>",
-                        language = "<language>",
-                        modality = "transcript",
-                        role = "agent",
+                        ["id"] = "<id>",
+                        ["participantId"] = "<participantId>",
+                        ["language"] = "<language>",
+                        ["modality"] = "transcript",
+                        ["role"] = "agent",
                     },
                 },
-                parameters = new
+                ["parameters"] = new Dictionary<string, object>()
                 {
-                    projectName = "<projectName>",
-                    deploymentName = "<deploymentName>",
-                    verbose = true,
-                    isLoggingEnabled = true,
-                    stringIndexType = "Utf16CodeUnit",
-                    directTarget = "<directTarget>",
-                    targetProjectParameters = new
+                    ["projectName"] = "<projectName>",
+                    ["deploymentName"] = "<deploymentName>",
+                    ["verbose"] = true,
+                    ["isLoggingEnabled"] = true,
+                    ["stringIndexType"] = "Utf16CodeUnit",
+                    ["directTarget"] = "<directTarget>",
+                    ["targetProjectParameters"] = new Dictionary<string, object>()
                     {
-                        key = new
+                        ["key"] = new Dictionary<string, object>()
                         {
-                            query = "<query>",
-                            callingOptions = new
+                            ["query"] = "<query>",
+                            ["callingOptions"] = new Dictionary<string, object>()
                             {
-                                verbose = true,
-                                log = true,
-                                show_all_intents = true,
-                                timezoneOffset = 123.45f,
-                                spellCheck = true,
-                                bing_spell_check_subscription_key = "<bing-spell-check-subscription-key>",
+                                ["verbose"] = true,
+                                ["log"] = true,
+                                ["show-all-intents"] = true,
+                                ["timezoneOffset"] = 123.45F,
+                                ["spellCheck"] = true,
+                                ["bing-spell-check-subscription-key"] = "<bing-spell-check-subscription-key>",
                             },
-                            targetProjectKind = "Luis",
-                            apiVersion = "<apiVersion>",
+                            ["targetProjectKind"] = "Luis",
+                            ["apiVersion"] = "<apiVersion>",
                         },
                     },
                 },
-                kind = "Conversation",
-            };
-
-            Response response = client.AnalyzeConversation(RequestContent.Create(data));
+                ["kind"] = "Conversation",
+            });
+            Response response = client.AnalyzeConversation(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -114,30 +110,28 @@ public void Example_AnalyzeConversation_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AnalyzeConversation_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                analysisInput = new
+                ["analysisInput"] = new Dictionary<string, object>()
                 {
-                    conversationItem = new
+                    ["conversationItem"] = new Dictionary<string, object>()
                     {
-                        text = "<text>",
-                        id = "<id>",
-                        participantId = "<participantId>",
+                        ["id"] = "<id>",
+                        ["participantId"] = "<participantId>",
                     },
                 },
-                parameters = new
+                ["parameters"] = new Dictionary<string, object>()
                 {
-                    projectName = "<projectName>",
-                    deploymentName = "<deploymentName>",
+                    ["projectName"] = "<projectName>",
+                    ["deploymentName"] = "<deploymentName>",
                 },
-                kind = "Conversation",
-            };
-
-            Response response = await client.AnalyzeConversationAsync(RequestContent.Create(data));
+                ["kind"] = "Conversation",
+            });
+            Response response = await client.AnalyzeConversationAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -147,55 +141,53 @@ public async Task Example_AnalyzeConversation_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AnalyzeConversation_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                analysisInput = new
+                ["analysisInput"] = new Dictionary<string, object>()
                 {
-                    conversationItem = new
+                    ["conversationItem"] = new Dictionary<string, object>()
                     {
-                        text = "<text>",
-                        id = "<id>",
-                        participantId = "<participantId>",
-                        language = "<language>",
-                        modality = "transcript",
-                        role = "agent",
+                        ["id"] = "<id>",
+                        ["participantId"] = "<participantId>",
+                        ["language"] = "<language>",
+                        ["modality"] = "transcript",
+                        ["role"] = "agent",
                     },
                 },
-                parameters = new
+                ["parameters"] = new Dictionary<string, object>()
                 {
-                    projectName = "<projectName>",
-                    deploymentName = "<deploymentName>",
-                    verbose = true,
-                    isLoggingEnabled = true,
-                    stringIndexType = "Utf16CodeUnit",
-                    directTarget = "<directTarget>",
-                    targetProjectParameters = new
+                    ["projectName"] = "<projectName>",
+                    ["deploymentName"] = "<deploymentName>",
+                    ["verbose"] = true,
+                    ["isLoggingEnabled"] = true,
+                    ["stringIndexType"] = "Utf16CodeUnit",
+                    ["directTarget"] = "<directTarget>",
+                    ["targetProjectParameters"] = new Dictionary<string, object>()
                     {
-                        key = new
+                        ["key"] = new Dictionary<string, object>()
                         {
-                            query = "<query>",
-                            callingOptions = new
+                            ["query"] = "<query>",
+                            ["callingOptions"] = new Dictionary<string, object>()
                             {
-                                verbose = true,
-                                log = true,
-                                show_all_intents = true,
-                                timezoneOffset = 123.45f,
-                                spellCheck = true,
-                                bing_spell_check_subscription_key = "<bing-spell-check-subscription-key>",
+                                ["verbose"] = true,
+                                ["log"] = true,
+                                ["show-all-intents"] = true,
+                                ["timezoneOffset"] = 123.45F,
+                                ["spellCheck"] = true,
+                                ["bing-spell-check-subscription-key"] = "<bing-spell-check-subscription-key>",
                             },
-                            targetProjectKind = "Luis",
-                            apiVersion = "<apiVersion>",
+                            ["targetProjectKind"] = "Luis",
+                            ["apiVersion"] = "<apiVersion>",
                         },
                     },
                 },
-                kind = "Conversation",
-            };
-
-            Response response = await client.AnalyzeConversationAsync(RequestContent.Create(data));
+                ["kind"] = "Conversation",
+            });
+            Response response = await client.AnalyzeConversationAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -205,11 +197,11 @@ public async Task Example_AnalyzeConversation_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAnalyzeConversationJobStatus()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            Response response = client.GetAnalyzeConversationJobStatus(Guid.NewGuid());
+            Response response = client.GetAnalyzeConversationJobStatus(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -222,11 +214,11 @@ public void Example_GetAnalyzeConversationJobStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAnalyzeConversationJobStatus_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            Response response = client.GetAnalyzeConversationJobStatus(Guid.NewGuid(), true);
+            Response response = client.GetAnalyzeConversationJobStatus(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), showStats: true);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("displayName").ToString());
@@ -243,11 +235,11 @@ public void Example_GetAnalyzeConversationJobStatus_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("nextLink").ToString());
         }
@@ -256,11 +248,11 @@ public void Example_GetAnalyzeConversationJobStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAnalyzeConversationJobStatus_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            Response response = await client.GetAnalyzeConversationJobStatusAsync(Guid.NewGuid());
+            Response response = await client.GetAnalyzeConversationJobStatusAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -273,11 +265,11 @@ public async Task Example_GetAnalyzeConversationJobStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAnalyzeConversationJobStatus_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            Response response = await client.GetAnalyzeConversationJobStatusAsync(Guid.NewGuid(), true);
+            Response response = await client.GetAnalyzeConversationJobStatusAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), showStats: true);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("displayName").ToString());
@@ -294,11 +286,11 @@ public async Task Example_GetAnalyzeConversationJobStatus_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("nextLink").ToString());
         }
@@ -307,39 +299,44 @@ public async Task Example_GetAnalyzeConversationJobStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_AnalyzeConversations()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                analysisInput = new
+                ["analysisInput"] = new Dictionary<string, object>()
                 {
-                    conversations = new[] {
-            new {
-                conversationItems = new[] {
-                    new {
-                        text = "<text>",
-                        id = "<id>",
-                        participantId = "<participantId>",
-                    }
-                },
-                id = "<id>",
-                language = "<language>",
-                modality = "text",
-            }
-        },
+                    ["conversations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["conversationItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["text"] = "<text>",
+["id"] = "<id>",
+["participantId"] = "<participantId>",
+}
+},
+["id"] = "<id>",
+["language"] = "<language>",
+["modality"] = "text",
+}
+},
                 },
-                tasks = new[] {
-        new {
-            kind = "ConversationalSummarizationTask",
-        }
-    },
-            };
-
-            var operation = client.AnalyzeConversations(WaitUntil.Completed, RequestContent.Create(data));
-
+                ["tasks"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["kind"] = "ConversationalSummarizationTask",
+}
+},
+            });
+            Operation<BinaryData> operation = client.AnalyzeConversations(WaitUntil.Completed, content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("jobId").ToString());
@@ -351,52 +348,59 @@ public void Example_AnalyzeConversations()
         [Ignore("Only validating compilation of examples")]
         public void Example_AnalyzeConversations_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                displayName = "<displayName>",
-                analysisInput = new
+                ["displayName"] = "<displayName>",
+                ["analysisInput"] = new Dictionary<string, object>()
                 {
-                    conversations = new[] {
-            new {
-                conversationItems = new[] {
-                    new {
-                        text = "<text>",
-                        id = "<id>",
-                        participantId = "<participantId>",
-                        language = "<language>",
-                        modality = "transcript",
-                        role = "agent",
-                    }
-                },
-                id = "<id>",
-                language = "<language>",
-                modality = "text",
-                domain = "finance",
-            }
-        },
-                },
-                tasks = new[] {
-        new {
-            parameters = new {
-                summaryAspects = new[] {
-                    "issue"
+                    ["conversations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["conversationItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["text"] = "<text>",
+["id"] = "<id>",
+["participantId"] = "<participantId>",
+["language"] = "<language>",
+["modality"] = "transcript",
+["role"] = "agent",
+}
+},
+["id"] = "<id>",
+["language"] = "<language>",
+["modality"] = "text",
+["domain"] = "finance",
+}
+},
                 },
-                modelVersion = "<modelVersion>",
-                loggingOptOut = true,
-            },
-            kind = "ConversationalSummarizationTask",
-            taskName = "<taskName>",
-        }
-    },
-            };
-
-            var operation = client.AnalyzeConversations(WaitUntil.Completed, RequestContent.Create(data));
-
+                ["tasks"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["parameters"] = new Dictionary<string, object>()
+{
+["summaryAspects"] = new List<object>()
+{
+"issue"
+},
+["modelVersion"] = "<modelVersion>",
+["loggingOptOut"] = true,
+},
+["kind"] = "ConversationalSummarizationTask",
+["taskName"] = "<taskName>",
+}
+},
+            });
+            Operation<BinaryData> operation = client.AnalyzeConversations(WaitUntil.Completed, content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("displayName").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -412,11 +416,11 @@ public void Example_AnalyzeConversations_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("nextLink").ToString());
         }
@@ -425,39 +429,44 @@ public void Example_AnalyzeConversations_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AnalyzeConversations_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                analysisInput = new
+                ["analysisInput"] = new Dictionary<string, object>()
                 {
-                    conversations = new[] {
-            new {
-                conversationItems = new[] {
-                    new {
-                        text = "<text>",
-                        id = "<id>",
-                        participantId = "<participantId>",
-                    }
-                },
-                id = "<id>",
-                language = "<language>",
-                modality = "text",
-            }
-        },
+                    ["conversations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["conversationItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["text"] = "<text>",
+["id"] = "<id>",
+["participantId"] = "<participantId>",
+}
+},
+["id"] = "<id>",
+["language"] = "<language>",
+["modality"] = "text",
+}
+},
                 },
-                tasks = new[] {
-        new {
-            kind = "ConversationalSummarizationTask",
-        }
-    },
-            };
-
-            var operation = await client.AnalyzeConversationsAsync(WaitUntil.Completed, RequestContent.Create(data));
-
+                ["tasks"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["kind"] = "ConversationalSummarizationTask",
+}
+},
+            });
+            Operation<BinaryData> operation = await client.AnalyzeConversationsAsync(WaitUntil.Completed, content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("jobId").ToString());
@@ -469,52 +478,59 @@ public async Task Example_AnalyzeConversations_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AnalyzeConversations_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                displayName = "<displayName>",
-                analysisInput = new
+                ["displayName"] = "<displayName>",
+                ["analysisInput"] = new Dictionary<string, object>()
                 {
-                    conversations = new[] {
-            new {
-                conversationItems = new[] {
-                    new {
-                        text = "<text>",
-                        id = "<id>",
-                        participantId = "<participantId>",
-                        language = "<language>",
-                        modality = "transcript",
-                        role = "agent",
-                    }
-                },
-                id = "<id>",
-                language = "<language>",
-                modality = "text",
-                domain = "finance",
-            }
-        },
-                },
-                tasks = new[] {
-        new {
-            parameters = new {
-                summaryAspects = new[] {
-                    "issue"
+                    ["conversations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["conversationItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["text"] = "<text>",
+["id"] = "<id>",
+["participantId"] = "<participantId>",
+["language"] = "<language>",
+["modality"] = "transcript",
+["role"] = "agent",
+}
+},
+["id"] = "<id>",
+["language"] = "<language>",
+["modality"] = "text",
+["domain"] = "finance",
+}
+},
                 },
-                modelVersion = "<modelVersion>",
-                loggingOptOut = true,
-            },
-            kind = "ConversationalSummarizationTask",
-            taskName = "<taskName>",
-        }
-    },
-            };
-
-            var operation = await client.AnalyzeConversationsAsync(WaitUntil.Completed, RequestContent.Create(data));
-
+                ["tasks"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["parameters"] = new Dictionary<string, object>()
+{
+["summaryAspects"] = new List<object>()
+{
+"issue"
+},
+["modelVersion"] = "<modelVersion>",
+["loggingOptOut"] = true,
+},
+["kind"] = "ConversationalSummarizationTask",
+["taskName"] = "<taskName>",
+}
+},
+            });
+            Operation<BinaryData> operation = await client.AnalyzeConversationsAsync(WaitUntil.Completed, content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("displayName").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -530,11 +546,11 @@ public async Task Example_AnalyzeConversations_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("nextLink").ToString());
         }
@@ -543,52 +559,44 @@ public async Task Example_AnalyzeConversations_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CancelAnalyzeConversations()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            var operation = client.CancelAnalyzeConversations(WaitUntil.Completed, Guid.NewGuid());
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.CancelAnalyzeConversations(WaitUntil.Completed, Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CancelAnalyzeConversations_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
-
-            var operation = client.CancelAnalyzeConversations(WaitUntil.Completed, Guid.NewGuid());
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.CancelAnalyzeConversations(WaitUntil.Completed, Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CancelAnalyzeConversations_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            var operation = await client.CancelAnalyzeConversationsAsync(WaitUntil.Completed, Guid.NewGuid());
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.CancelAnalyzeConversationsAsync(WaitUntil.Completed, Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CancelAnalyzeConversations_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAnalysisClient(endpoint, credential);
-
-            var operation = await client.CancelAnalyzeConversationsAsync(WaitUntil.Completed, Guid.NewGuid());
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAnalysisClient client = new ConversationAnalysisClient(endpoint, credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.CancelAnalyzeConversationsAsync(WaitUntil.Completed, Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
         }
     }
 }
diff --git a/sdk/cognitivelanguage/Azure.AI.Language.Conversations/tests/Generated/Samples/Samples_ConversationAuthoringClient.cs b/sdk/cognitivelanguage/Azure.AI.Language.Conversations/tests/Generated/Samples/Samples_ConversationAuthoringClient.cs
index 2ccf73453910..469ed02dfb53 100644
--- a/sdk/cognitivelanguage/Azure.AI.Language.Conversations/tests/Generated/Samples/Samples_ConversationAuthoringClient.cs
+++ b/sdk/cognitivelanguage/Azure.AI.Language.Conversations/tests/Generated/Samples/Samples_ConversationAuthoringClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.AI.Language.Conversations.Authoring;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,18 +23,17 @@ public class Samples_ConversationAuthoringClient
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateProject()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                projectKind = "Conversation",
-                projectName = "<projectName>",
-                language = "<language>",
-            };
-
-            Response response = client.CreateProject("<projectName>", RequestContent.Create(data));
+                ["projectKind"] = "Conversation",
+                ["projectName"] = "<projectName>",
+                ["language"] = "<language>",
+            });
+            Response response = client.CreateProject("<projectName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -48,24 +47,23 @@ public void Example_CreateProject()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateProject_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                projectKind = "Conversation",
-                settings = new
+                ["projectKind"] = "Conversation",
+                ["settings"] = new Dictionary<string, object>()
                 {
-                    confidenceThreshold = 123.45f,
+                    ["confidenceThreshold"] = 123.45F,
                 },
-                projectName = "<projectName>",
-                multilingual = true,
-                description = "<description>",
-                language = "<language>",
-            };
-
-            Response response = client.CreateProject("<projectName>", RequestContent.Create(data));
+                ["projectName"] = "<projectName>",
+                ["multilingual"] = true,
+                ["description"] = "<description>",
+                ["language"] = "<language>",
+            });
+            Response response = client.CreateProject("<projectName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -84,18 +82,17 @@ public void Example_CreateProject_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateProject_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                projectKind = "Conversation",
-                projectName = "<projectName>",
-                language = "<language>",
-            };
-
-            Response response = await client.CreateProjectAsync("<projectName>", RequestContent.Create(data));
+                ["projectKind"] = "Conversation",
+                ["projectName"] = "<projectName>",
+                ["language"] = "<language>",
+            });
+            Response response = await client.CreateProjectAsync("<projectName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -109,24 +106,23 @@ public async Task Example_CreateProject_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateProject_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                projectKind = "Conversation",
-                settings = new
+                ["projectKind"] = "Conversation",
+                ["settings"] = new Dictionary<string, object>()
                 {
-                    confidenceThreshold = 123.45f,
+                    ["confidenceThreshold"] = 123.45F,
                 },
-                projectName = "<projectName>",
-                multilingual = true,
-                description = "<description>",
-                language = "<language>",
-            };
-
-            Response response = await client.CreateProjectAsync("<projectName>", RequestContent.Create(data));
+                ["projectName"] = "<projectName>",
+                ["multilingual"] = true,
+                ["description"] = "<description>",
+                ["language"] = "<language>",
+            });
+            Response response = await client.CreateProjectAsync("<projectName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -145,9 +141,9 @@ public async Task Example_CreateProject_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProject()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetProject("<projectName>");
 
@@ -163,9 +159,9 @@ public void Example_GetProject()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProject_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetProject("<projectName>");
 
@@ -186,9 +182,9 @@ public void Example_GetProject_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProject_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetProjectAsync("<projectName>");
 
@@ -204,9 +200,9 @@ public async Task Example_GetProject_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProject_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetProjectAsync("<projectName>");
 
@@ -227,9 +223,9 @@ public async Task Example_GetProject_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeployment()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetDeployment("<projectName>", "<deploymentName>");
 
@@ -246,9 +242,9 @@ public void Example_GetDeployment()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeployment_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetDeployment("<projectName>", "<deploymentName>");
 
@@ -265,9 +261,9 @@ public void Example_GetDeployment_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeployment_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetDeploymentAsync("<projectName>", "<deploymentName>");
 
@@ -284,9 +280,9 @@ public async Task Example_GetDeployment_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeployment_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetDeploymentAsync("<projectName>", "<deploymentName>");
 
@@ -303,9 +299,9 @@ public async Task Example_GetDeployment_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeploymentJobStatus()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetDeploymentJobStatus("<projectName>", "<deploymentName>", "<jobId>");
 
@@ -320,9 +316,9 @@ public void Example_GetDeploymentJobStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeploymentJobStatus_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetDeploymentJobStatus("<projectName>", "<deploymentName>", "<jobId>");
 
@@ -342,11 +338,11 @@ public void Example_GetDeploymentJobStatus_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -354,9 +350,9 @@ public void Example_GetDeploymentJobStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeploymentJobStatus_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetDeploymentJobStatusAsync("<projectName>", "<deploymentName>", "<jobId>");
 
@@ -371,9 +367,9 @@ public async Task Example_GetDeploymentJobStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeploymentJobStatus_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetDeploymentJobStatusAsync("<projectName>", "<deploymentName>", "<jobId>");
 
@@ -393,11 +389,11 @@ public async Task Example_GetDeploymentJobStatus_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -405,9 +401,9 @@ public async Task Example_GetDeploymentJobStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSwapDeploymentsJobStatus()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetSwapDeploymentsJobStatus("<projectName>", "<jobId>");
 
@@ -422,9 +418,9 @@ public void Example_GetSwapDeploymentsJobStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSwapDeploymentsJobStatus_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetSwapDeploymentsJobStatus("<projectName>", "<jobId>");
 
@@ -444,11 +440,11 @@ public void Example_GetSwapDeploymentsJobStatus_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -456,9 +452,9 @@ public void Example_GetSwapDeploymentsJobStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSwapDeploymentsJobStatus_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetSwapDeploymentsJobStatusAsync("<projectName>", "<jobId>");
 
@@ -473,9 +469,9 @@ public async Task Example_GetSwapDeploymentsJobStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSwapDeploymentsJobStatus_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetSwapDeploymentsJobStatusAsync("<projectName>", "<jobId>");
 
@@ -495,11 +491,11 @@ public async Task Example_GetSwapDeploymentsJobStatus_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -507,9 +503,9 @@ public async Task Example_GetSwapDeploymentsJobStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetExportProjectJobStatus()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetExportProjectJobStatus("<projectName>", "<jobId>");
 
@@ -521,9 +517,9 @@ public void Example_GetExportProjectJobStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetExportProjectJobStatus_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetExportProjectJobStatus("<projectName>", "<jobId>");
 
@@ -544,11 +540,11 @@ public void Example_GetExportProjectJobStatus_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -556,9 +552,9 @@ public void Example_GetExportProjectJobStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetExportProjectJobStatus_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetExportProjectJobStatusAsync("<projectName>", "<jobId>");
 
@@ -570,9 +566,9 @@ public async Task Example_GetExportProjectJobStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetExportProjectJobStatus_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetExportProjectJobStatusAsync("<projectName>", "<jobId>");
 
@@ -593,11 +589,11 @@ public async Task Example_GetExportProjectJobStatus_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -605,9 +601,9 @@ public async Task Example_GetExportProjectJobStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetImportProjectJobStatus()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetImportProjectJobStatus("<projectName>", "<jobId>");
 
@@ -622,9 +618,9 @@ public void Example_GetImportProjectJobStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetImportProjectJobStatus_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetImportProjectJobStatus("<projectName>", "<jobId>");
 
@@ -644,11 +640,11 @@ public void Example_GetImportProjectJobStatus_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -656,9 +652,9 @@ public void Example_GetImportProjectJobStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetImportProjectJobStatus_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetImportProjectJobStatusAsync("<projectName>", "<jobId>");
 
@@ -673,9 +669,9 @@ public async Task Example_GetImportProjectJobStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetImportProjectJobStatus_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetImportProjectJobStatusAsync("<projectName>", "<jobId>");
 
@@ -695,11 +691,11 @@ public async Task Example_GetImportProjectJobStatus_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -707,9 +703,9 @@ public async Task Example_GetImportProjectJobStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTrainedModel()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetTrainedModel("<projectName>", "<trainedModelLabel>");
 
@@ -727,9 +723,9 @@ public void Example_GetTrainedModel()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTrainedModel_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetTrainedModel("<projectName>", "<trainedModelLabel>");
 
@@ -747,9 +743,9 @@ public void Example_GetTrainedModel_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTrainedModel_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetTrainedModelAsync("<projectName>", "<trainedModelLabel>");
 
@@ -767,9 +763,9 @@ public async Task Example_GetTrainedModel_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTrainedModel_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetTrainedModelAsync("<projectName>", "<trainedModelLabel>");
 
@@ -787,9 +783,9 @@ public async Task Example_GetTrainedModel_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTrainedModel()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.DeleteTrainedModel("<projectName>", "<trainedModelLabel>");
             Console.WriteLine(response.Status);
@@ -799,9 +795,9 @@ public void Example_DeleteTrainedModel()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTrainedModel_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.DeleteTrainedModel("<projectName>", "<trainedModelLabel>");
             Console.WriteLine(response.Status);
@@ -811,9 +807,9 @@ public void Example_DeleteTrainedModel_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTrainedModel_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.DeleteTrainedModelAsync("<projectName>", "<trainedModelLabel>");
             Console.WriteLine(response.Status);
@@ -823,9 +819,9 @@ public async Task Example_DeleteTrainedModel_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTrainedModel_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.DeleteTrainedModelAsync("<projectName>", "<trainedModelLabel>");
             Console.WriteLine(response.Status);
@@ -835,37 +831,37 @@ public async Task Example_DeleteTrainedModel_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetModelEvaluationSummary()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetModelEvaluationSummary("<projectName>", "<trainedModelLabel>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("normalizedValue").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("rawValue").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("f1").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("precision").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("recall").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("truePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("trueNegativeCount").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("falsePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("falseNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("f1").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("precision").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("recall").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microF1").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microPrecision").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microRecall").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroF1").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroPrecision").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroRecall").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("normalizedValue").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("rawValue").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("f1").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("precision").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("recall").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("truePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("trueNegativeCount").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("falsePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("falseNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("f1").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("precision").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("recall").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
             Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microF1").ToString());
             Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microPrecision").ToString());
             Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microRecall").ToString());
@@ -878,37 +874,37 @@ public void Example_GetModelEvaluationSummary()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetModelEvaluationSummary_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetModelEvaluationSummary("<projectName>", "<trainedModelLabel>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("normalizedValue").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("rawValue").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("f1").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("precision").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("recall").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("truePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("trueNegativeCount").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("falsePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("falseNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("f1").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("precision").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("recall").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microF1").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microPrecision").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microRecall").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroF1").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroPrecision").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroRecall").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("normalizedValue").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("rawValue").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("f1").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("precision").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("recall").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("truePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("trueNegativeCount").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("falsePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("falseNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("f1").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("precision").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("recall").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
             Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microF1").ToString());
             Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microPrecision").ToString());
             Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microRecall").ToString());
@@ -924,37 +920,37 @@ public void Example_GetModelEvaluationSummary_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetModelEvaluationSummary_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetModelEvaluationSummaryAsync("<projectName>", "<trainedModelLabel>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("normalizedValue").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("rawValue").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("f1").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("precision").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("recall").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("truePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("trueNegativeCount").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("falsePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("falseNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("f1").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("precision").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("recall").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microF1").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microPrecision").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microRecall").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroF1").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroPrecision").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroRecall").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("normalizedValue").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("rawValue").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("f1").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("precision").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("recall").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("truePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("trueNegativeCount").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("falsePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("falseNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("f1").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("precision").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("recall").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
             Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microF1").ToString());
             Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microPrecision").ToString());
             Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microRecall").ToString());
@@ -967,37 +963,37 @@ public async Task Example_GetModelEvaluationSummary_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetModelEvaluationSummary_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetModelEvaluationSummaryAsync("<projectName>", "<trainedModelLabel>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("normalizedValue").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("rawValue").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("f1").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("precision").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("recall").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("truePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("trueNegativeCount").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("falsePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<test>").GetProperty("falseNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("f1").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("precision").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("recall").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("entities").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microF1").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microPrecision").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("microRecall").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroF1").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroPrecision").ToString());
             Console.WriteLine(result.GetProperty("entitiesEvaluation").GetProperty("macroRecall").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("normalizedValue").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<test>").GetProperty("<test>").GetProperty("rawValue").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("f1").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("precision").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("recall").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("truePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("trueNegativeCount").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("falsePositiveCount").ToString());
-            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<test>").GetProperty("falseNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("normalizedValue").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("confusionMatrix").GetProperty("<key>").GetProperty("<key>").GetProperty("rawValue").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("f1").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("precision").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("recall").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("truePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("trueNegativeCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falsePositiveCount").ToString());
+            Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("intents").GetProperty("<key>").GetProperty("falseNegativeCount").ToString());
             Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microF1").ToString());
             Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microPrecision").ToString());
             Console.WriteLine(result.GetProperty("intentsEvaluation").GetProperty("microRecall").ToString());
@@ -1013,9 +1009,9 @@ public async Task Example_GetModelEvaluationSummary_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLoadSnapshotJobStatus()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetLoadSnapshotJobStatus("<projectName>", "<trainedModelLabel>", "<jobId>");
 
@@ -1030,9 +1026,9 @@ public void Example_GetLoadSnapshotJobStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLoadSnapshotJobStatus_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetLoadSnapshotJobStatus("<projectName>", "<trainedModelLabel>", "<jobId>");
 
@@ -1052,11 +1048,11 @@ public void Example_GetLoadSnapshotJobStatus_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -1064,9 +1060,9 @@ public void Example_GetLoadSnapshotJobStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLoadSnapshotJobStatus_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetLoadSnapshotJobStatusAsync("<projectName>", "<trainedModelLabel>", "<jobId>");
 
@@ -1081,9 +1077,9 @@ public async Task Example_GetLoadSnapshotJobStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLoadSnapshotJobStatus_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetLoadSnapshotJobStatusAsync("<projectName>", "<trainedModelLabel>", "<jobId>");
 
@@ -1103,11 +1099,11 @@ public async Task Example_GetLoadSnapshotJobStatus_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -1115,9 +1111,9 @@ public async Task Example_GetLoadSnapshotJobStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTrainingJobStatus()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetTrainingJobStatus("<projectName>", "<jobId>");
 
@@ -1136,9 +1132,9 @@ public void Example_GetTrainingJobStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTrainingJobStatus_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetTrainingJobStatus("<projectName>", "<jobId>");
 
@@ -1170,11 +1166,11 @@ public void Example_GetTrainingJobStatus_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -1182,9 +1178,9 @@ public void Example_GetTrainingJobStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTrainingJobStatus_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetTrainingJobStatusAsync("<projectName>", "<jobId>");
 
@@ -1203,9 +1199,9 @@ public async Task Example_GetTrainingJobStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTrainingJobStatus_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetTrainingJobStatusAsync("<projectName>", "<jobId>");
 
@@ -1237,11 +1233,11 @@ public async Task Example_GetTrainingJobStatus_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -1249,9 +1245,9 @@ public async Task Example_GetTrainingJobStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProjectDeletionJobStatus()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetProjectDeletionJobStatus("<jobId>");
 
@@ -1266,9 +1262,9 @@ public void Example_GetProjectDeletionJobStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProjectDeletionJobStatus_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = client.GetProjectDeletionJobStatus("<jobId>");
 
@@ -1288,11 +1284,11 @@ public void Example_GetProjectDeletionJobStatus_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -1300,9 +1296,9 @@ public void Example_GetProjectDeletionJobStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProjectDeletionJobStatus_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetProjectDeletionJobStatusAsync("<jobId>");
 
@@ -1317,9 +1313,9 @@ public async Task Example_GetProjectDeletionJobStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProjectDeletionJobStatus_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
             Response response = await client.GetProjectDeletionJobStatusAsync("<jobId>");
 
@@ -1339,11 +1335,11 @@ public async Task Example_GetProjectDeletionJobStatus_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -1351,18 +1347,18 @@ public async Task Example_GetProjectDeletionJobStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProjects()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetProjects())
+            foreach (BinaryData item in client.GetProjects())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("projectKind").ToString());
-                Console.WriteLine(result.GetProperty("projectName").ToString());
-                Console.WriteLine(result.GetProperty("language").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("projectKind").ToString());
+                Console.WriteLine(result[0].GetProperty("projectName").ToString());
+                Console.WriteLine(result[0].GetProperty("language").ToString());
             }
         }
 
@@ -1370,23 +1366,23 @@ public void Example_GetProjects()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProjects_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetProjects())
+            foreach (BinaryData item in client.GetProjects())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("projectKind").ToString());
-                Console.WriteLine(result.GetProperty("settings").GetProperty("confidenceThreshold").ToString());
-                Console.WriteLine(result.GetProperty("projectName").ToString());
-                Console.WriteLine(result.GetProperty("multilingual").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("language").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("projectKind").ToString());
+                Console.WriteLine(result[0].GetProperty("settings").GetProperty("confidenceThreshold").ToString());
+                Console.WriteLine(result[0].GetProperty("projectName").ToString());
+                Console.WriteLine(result[0].GetProperty("multilingual").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("language").ToString());
             }
         }
 
@@ -1394,18 +1390,18 @@ public void Example_GetProjects_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProjects_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetProjectsAsync())
+            await foreach (BinaryData item in client.GetProjectsAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("projectKind").ToString());
-                Console.WriteLine(result.GetProperty("projectName").ToString());
-                Console.WriteLine(result.GetProperty("language").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("projectKind").ToString());
+                Console.WriteLine(result[0].GetProperty("projectName").ToString());
+                Console.WriteLine(result[0].GetProperty("language").ToString());
             }
         }
 
@@ -1413,23 +1409,23 @@ public async Task Example_GetProjects_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProjects_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetProjectsAsync())
+            await foreach (BinaryData item in client.GetProjectsAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("projectKind").ToString());
-                Console.WriteLine(result.GetProperty("settings").GetProperty("confidenceThreshold").ToString());
-                Console.WriteLine(result.GetProperty("projectName").ToString());
-                Console.WriteLine(result.GetProperty("multilingual").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("language").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("projectKind").ToString());
+                Console.WriteLine(result[0].GetProperty("settings").GetProperty("confidenceThreshold").ToString());
+                Console.WriteLine(result[0].GetProperty("projectName").ToString());
+                Console.WriteLine(result[0].GetProperty("multilingual").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("language").ToString());
             }
         }
 
@@ -1437,19 +1433,19 @@ public async Task Example_GetProjects_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeployments()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetDeployments("<projectName>"))
+            foreach (BinaryData item in client.GetDeployments("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deploymentName").ToString());
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("deploymentExpirationDate").ToString());
-                Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentName").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentExpirationDate").ToString());
+                Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
             }
         }
 
@@ -1457,19 +1453,19 @@ public void Example_GetDeployments()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeployments_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetDeployments("<projectName>"))
+            foreach (BinaryData item in client.GetDeployments("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deploymentName").ToString());
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("deploymentExpirationDate").ToString());
-                Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentName").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentExpirationDate").ToString());
+                Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
             }
         }
 
@@ -1477,19 +1473,19 @@ public void Example_GetDeployments_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeployments_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetDeploymentsAsync("<projectName>"))
+            await foreach (BinaryData item in client.GetDeploymentsAsync("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deploymentName").ToString());
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("deploymentExpirationDate").ToString());
-                Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentName").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentExpirationDate").ToString());
+                Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
             }
         }
 
@@ -1497,19 +1493,19 @@ public async Task Example_GetDeployments_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeployments_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetDeploymentsAsync("<projectName>"))
+            await foreach (BinaryData item in client.GetDeploymentsAsync("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deploymentName").ToString());
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("deploymentExpirationDate").ToString());
-                Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentName").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentExpirationDate").ToString());
+                Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
             }
         }
 
@@ -1517,20 +1513,20 @@ public async Task Example_GetDeployments_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTrainedModels()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetTrainedModels("<projectName>"))
+            foreach (BinaryData item in client.GetTrainedModels("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("label").ToString());
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastTrainingDurationInSeconds").ToString());
-                Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
-                Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
-                Console.WriteLine(result.GetProperty("hasSnapshot").ToString());
+                Console.WriteLine(result[0].GetProperty("label").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastTrainingDurationInSeconds").ToString());
+                Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
+                Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("hasSnapshot").ToString());
             }
         }
 
@@ -1538,20 +1534,20 @@ public void Example_GetTrainedModels()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTrainedModels_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetTrainedModels("<projectName>"))
+            foreach (BinaryData item in client.GetTrainedModels("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("label").ToString());
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastTrainingDurationInSeconds").ToString());
-                Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
-                Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
-                Console.WriteLine(result.GetProperty("hasSnapshot").ToString());
+                Console.WriteLine(result[0].GetProperty("label").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastTrainingDurationInSeconds").ToString());
+                Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
+                Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("hasSnapshot").ToString());
             }
         }
 
@@ -1559,20 +1555,20 @@ public void Example_GetTrainedModels_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTrainedModels_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetTrainedModelsAsync("<projectName>"))
+            await foreach (BinaryData item in client.GetTrainedModelsAsync("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("label").ToString());
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastTrainingDurationInSeconds").ToString());
-                Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
-                Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
-                Console.WriteLine(result.GetProperty("hasSnapshot").ToString());
+                Console.WriteLine(result[0].GetProperty("label").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastTrainingDurationInSeconds").ToString());
+                Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
+                Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("hasSnapshot").ToString());
             }
         }
 
@@ -1580,20 +1576,20 @@ public async Task Example_GetTrainedModels_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTrainedModels_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetTrainedModelsAsync("<projectName>"))
+            await foreach (BinaryData item in client.GetTrainedModelsAsync("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("label").ToString());
-                Console.WriteLine(result.GetProperty("modelId").ToString());
-                Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastTrainingDurationInSeconds").ToString());
-                Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
-                Console.WriteLine(result.GetProperty("modelTrainingConfigVersion").ToString());
-                Console.WriteLine(result.GetProperty("hasSnapshot").ToString());
+                Console.WriteLine(result[0].GetProperty("label").ToString());
+                Console.WriteLine(result[0].GetProperty("modelId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastTrainedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastTrainingDurationInSeconds").ToString());
+                Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
+                Console.WriteLine(result[0].GetProperty("modelTrainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("hasSnapshot").ToString());
             }
         }
 
@@ -1601,23 +1597,23 @@ public async Task Example_GetTrainedModels_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetModelEvaluationResults()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetModelEvaluationResults("<projectName>", "<trainedModelLabel>"))
+            foreach (BinaryData item in client.GetModelEvaluationResults("<projectName>", "<trainedModelLabel>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("text").ToString());
-                Console.WriteLine(result.GetProperty("language").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
-                Console.WriteLine(result.GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
-                Console.WriteLine(result.GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
+                Console.WriteLine(result[0].GetProperty("text").ToString());
+                Console.WriteLine(result[0].GetProperty("language").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
+                Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
+                Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
             }
         }
 
@@ -1625,23 +1621,23 @@ public void Example_GetModelEvaluationResults()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetModelEvaluationResults_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetModelEvaluationResults("<projectName>", "<trainedModelLabel>", "Utf16CodeUnit"))
+            foreach (BinaryData item in client.GetModelEvaluationResults("<projectName>", "<trainedModelLabel>", stringIndexType: "Utf16CodeUnit"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("text").ToString());
-                Console.WriteLine(result.GetProperty("language").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
-                Console.WriteLine(result.GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
-                Console.WriteLine(result.GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
+                Console.WriteLine(result[0].GetProperty("text").ToString());
+                Console.WriteLine(result[0].GetProperty("language").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
+                Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
+                Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
             }
         }
 
@@ -1649,23 +1645,23 @@ public void Example_GetModelEvaluationResults_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetModelEvaluationResults_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetModelEvaluationResultsAsync("<projectName>", "<trainedModelLabel>"))
+            await foreach (BinaryData item in client.GetModelEvaluationResultsAsync("<projectName>", "<trainedModelLabel>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("text").ToString());
-                Console.WriteLine(result.GetProperty("language").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
-                Console.WriteLine(result.GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
-                Console.WriteLine(result.GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
+                Console.WriteLine(result[0].GetProperty("text").ToString());
+                Console.WriteLine(result[0].GetProperty("language").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
+                Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
+                Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
             }
         }
 
@@ -1673,23 +1669,23 @@ public async Task Example_GetModelEvaluationResults_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetModelEvaluationResults_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetModelEvaluationResultsAsync("<projectName>", "<trainedModelLabel>", "Utf16CodeUnit"))
+            await foreach (BinaryData item in client.GetModelEvaluationResultsAsync("<projectName>", "<trainedModelLabel>", stringIndexType: "Utf16CodeUnit"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("text").ToString());
-                Console.WriteLine(result.GetProperty("language").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
-                Console.WriteLine(result.GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
-                Console.WriteLine(result.GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
-                Console.WriteLine(result.GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
+                Console.WriteLine(result[0].GetProperty("text").ToString());
+                Console.WriteLine(result[0].GetProperty("language").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("category").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("offset").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("expectedEntities")[0].GetProperty("length").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("category").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("offset").ToString());
+                Console.WriteLine(result[0].GetProperty("entitiesResult").GetProperty("predictedEntities")[0].GetProperty("length").ToString());
+                Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("expectedIntent").ToString());
+                Console.WriteLine(result[0].GetProperty("intentsResult").GetProperty("predictedIntent").ToString());
             }
         }
 
@@ -1697,21 +1693,21 @@ public async Task Example_GetModelEvaluationResults_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTrainingJobs()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetTrainingJobs("<projectName>"))
+            foreach (BinaryData item in client.GetTrainingJobs("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("jobId").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("modelLabel").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("jobId").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastUpdatedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
             }
         }
 
@@ -1719,46 +1715,46 @@ public void Example_GetTrainingJobs()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTrainingJobs_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetTrainingJobs("<projectName>"))
+            foreach (BinaryData item in client.GetTrainingJobs("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingMode").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("startDateTime").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("endDateTime").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("percentComplete").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("startDateTime").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("endDateTime").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("estimatedEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("jobId").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("warnings")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("warnings")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("modelLabel").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingMode").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("startDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("endDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("percentComplete").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("startDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("endDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("estimatedEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("jobId").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastUpdatedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("expirationDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("warnings")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("warnings")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
             }
         }
 
@@ -1766,21 +1762,21 @@ public void Example_GetTrainingJobs_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTrainingJobs_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetTrainingJobsAsync("<projectName>"))
+            await foreach (BinaryData item in client.GetTrainingJobsAsync("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("jobId").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("modelLabel").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("jobId").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastUpdatedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
             }
         }
 
@@ -1788,46 +1784,46 @@ public async Task Example_GetTrainingJobs_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTrainingJobs_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetTrainingJobsAsync("<projectName>"))
+            await foreach (BinaryData item in client.GetTrainingJobsAsync("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingMode").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("startDateTime").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("endDateTime").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("percentComplete").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("startDateTime").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("endDateTime").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("evaluationStatus").GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("result").GetProperty("estimatedEndDateTime").ToString());
-                Console.WriteLine(result.GetProperty("jobId").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("warnings")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("warnings")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("modelLabel").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingMode").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("percentComplete").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("startDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("endDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("trainingStatus").GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("percentComplete").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("startDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("endDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("evaluationStatus").GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("result").GetProperty("estimatedEndDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("jobId").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastUpdatedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("expirationDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("warnings")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("warnings")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
             }
         }
 
@@ -1835,15 +1831,15 @@ public async Task Example_GetTrainingJobs_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSupportedLanguages()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetSupportedLanguages("<projectKind>"))
+            foreach (BinaryData item in client.GetSupportedLanguages("Conversation"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("languageName").ToString());
-                Console.WriteLine(result.GetProperty("languageCode").ToString());
+                Console.WriteLine(result[0].GetProperty("languageName").ToString());
+                Console.WriteLine(result[0].GetProperty("languageCode").ToString());
             }
         }
 
@@ -1851,15 +1847,15 @@ public void Example_GetSupportedLanguages()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSupportedLanguages_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetSupportedLanguages("<projectKind>"))
+            foreach (BinaryData item in client.GetSupportedLanguages("Conversation"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("languageName").ToString());
-                Console.WriteLine(result.GetProperty("languageCode").ToString());
+                Console.WriteLine(result[0].GetProperty("languageName").ToString());
+                Console.WriteLine(result[0].GetProperty("languageCode").ToString());
             }
         }
 
@@ -1867,15 +1863,15 @@ public void Example_GetSupportedLanguages_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSupportedLanguages_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetSupportedLanguagesAsync("<projectKind>"))
+            await foreach (BinaryData item in client.GetSupportedLanguagesAsync("Conversation"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("languageName").ToString());
-                Console.WriteLine(result.GetProperty("languageCode").ToString());
+                Console.WriteLine(result[0].GetProperty("languageName").ToString());
+                Console.WriteLine(result[0].GetProperty("languageCode").ToString());
             }
         }
 
@@ -1883,15 +1879,15 @@ public async Task Example_GetSupportedLanguages_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSupportedLanguages_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetSupportedLanguagesAsync("<projectKind>"))
+            await foreach (BinaryData item in client.GetSupportedLanguagesAsync("Conversation"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("languageName").ToString());
-                Console.WriteLine(result.GetProperty("languageCode").ToString());
+                Console.WriteLine(result[0].GetProperty("languageName").ToString());
+                Console.WriteLine(result[0].GetProperty("languageCode").ToString());
             }
         }
 
@@ -1899,16 +1895,16 @@ public async Task Example_GetSupportedLanguages_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSupportedPrebuiltEntities()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetSupportedPrebuiltEntities())
+            foreach (BinaryData item in client.GetSupportedPrebuiltEntities())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("category").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("examples").ToString());
+                Console.WriteLine(result[0].GetProperty("category").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("examples").ToString());
             }
         }
 
@@ -1916,16 +1912,16 @@ public void Example_GetSupportedPrebuiltEntities()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSupportedPrebuiltEntities_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetSupportedPrebuiltEntities("<language>", true))
+            foreach (BinaryData item in client.GetSupportedPrebuiltEntities(language: "<language>", multilingual: true))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("category").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("examples").ToString());
+                Console.WriteLine(result[0].GetProperty("category").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("examples").ToString());
             }
         }
 
@@ -1933,16 +1929,16 @@ public void Example_GetSupportedPrebuiltEntities_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSupportedPrebuiltEntities_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetSupportedPrebuiltEntitiesAsync())
+            await foreach (BinaryData item in client.GetSupportedPrebuiltEntitiesAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("category").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("examples").ToString());
+                Console.WriteLine(result[0].GetProperty("category").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("examples").ToString());
             }
         }
 
@@ -1950,16 +1946,16 @@ public async Task Example_GetSupportedPrebuiltEntities_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSupportedPrebuiltEntities_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetSupportedPrebuiltEntitiesAsync("<language>", true))
+            await foreach (BinaryData item in client.GetSupportedPrebuiltEntitiesAsync(language: "<language>", multilingual: true))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("category").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("examples").ToString());
+                Console.WriteLine(result[0].GetProperty("category").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("examples").ToString());
             }
         }
 
@@ -1967,15 +1963,15 @@ public async Task Example_GetSupportedPrebuiltEntities_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTrainingConfigVersions()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetTrainingConfigVersions("<projectKind>"))
+            foreach (BinaryData item in client.GetTrainingConfigVersions("Conversation"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("trainingConfigVersion").ToString());
-                Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
+                Console.WriteLine(result[0].GetProperty("trainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
             }
         }
 
@@ -1983,15 +1979,15 @@ public void Example_GetTrainingConfigVersions()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTrainingConfigVersions_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetTrainingConfigVersions("<projectKind>"))
+            foreach (BinaryData item in client.GetTrainingConfigVersions("Conversation"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("trainingConfigVersion").ToString());
-                Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
+                Console.WriteLine(result[0].GetProperty("trainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
             }
         }
 
@@ -1999,15 +1995,15 @@ public void Example_GetTrainingConfigVersions_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTrainingConfigVersions_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetTrainingConfigVersionsAsync("<projectKind>"))
+            await foreach (BinaryData item in client.GetTrainingConfigVersionsAsync("Conversation"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("trainingConfigVersion").ToString());
-                Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
+                Console.WriteLine(result[0].GetProperty("trainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
             }
         }
 
@@ -2015,15 +2011,15 @@ public async Task Example_GetTrainingConfigVersions_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTrainingConfigVersions_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetTrainingConfigVersionsAsync("<projectKind>"))
+            await foreach (BinaryData item in client.GetTrainingConfigVersionsAsync("Conversation"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("trainingConfigVersion").ToString());
-                Console.WriteLine(result.GetProperty("modelExpirationDate").ToString());
+                Console.WriteLine(result[0].GetProperty("trainingConfigVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("modelExpirationDate").ToString());
             }
         }
 
@@ -2031,13 +2027,13 @@ public async Task Example_GetTrainingConfigVersions_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteProject()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = client.DeleteProject(WaitUntil.Completed, "<projectName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.DeleteProject(WaitUntil.Completed, "<projectName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2049,13 +2045,13 @@ public void Example_DeleteProject()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteProject_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = client.DeleteProject(WaitUntil.Completed, "<projectName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.DeleteProject(WaitUntil.Completed, "<projectName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2072,11 +2068,11 @@ public void Example_DeleteProject_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -2084,13 +2080,13 @@ public void Example_DeleteProject_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteProject_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = await client.DeleteProjectAsync(WaitUntil.Completed, "<projectName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.DeleteProjectAsync(WaitUntil.Completed, "<projectName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2102,13 +2098,13 @@ public async Task Example_DeleteProject_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteProject_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = await client.DeleteProjectAsync(WaitUntil.Completed, "<projectName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.DeleteProjectAsync(WaitUntil.Completed, "<projectName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2125,11 +2121,11 @@ public async Task Example_DeleteProject_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -2137,13 +2133,13 @@ public async Task Example_DeleteProject_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_ExportProject()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = client.ExportProject(WaitUntil.Completed, "<projectName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.ExportProject(WaitUntil.Completed, "<projectName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.ToString());
         }
@@ -2152,13 +2148,13 @@ public void Example_ExportProject()
         [Ignore("Only validating compilation of examples")]
         public void Example_ExportProject_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = client.ExportProject(WaitUntil.Completed, "<projectName>", "<exportedProjectFormat>", "<assetKind>", "Utf16CodeUnit", "<trainedModelLabel>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.ExportProject(WaitUntil.Completed, "<projectName>", exportedProjectFormat: "Conversation", assetKind: "<assetKind>", stringIndexType: "Utf16CodeUnit", trainedModelLabel: "<trainedModelLabel>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("resultUrl").ToString());
             Console.WriteLine(result.GetProperty("jobId").ToString());
@@ -2176,11 +2172,11 @@ public void Example_ExportProject_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -2188,13 +2184,13 @@ public void Example_ExportProject_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ExportProject_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = await client.ExportProjectAsync(WaitUntil.Completed, "<projectName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.ExportProjectAsync(WaitUntil.Completed, "<projectName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.ToString());
         }
@@ -2203,13 +2199,13 @@ public async Task Example_ExportProject_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ExportProject_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = await client.ExportProjectAsync(WaitUntil.Completed, "<projectName>", "<exportedProjectFormat>", "<assetKind>", "Utf16CodeUnit", "<trainedModelLabel>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.ExportProjectAsync(WaitUntil.Completed, "<projectName>", exportedProjectFormat: "Conversation", assetKind: "<assetKind>", stringIndexType: "Utf16CodeUnit", trainedModelLabel: "<trainedModelLabel>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("resultUrl").ToString());
             Console.WriteLine(result.GetProperty("jobId").ToString());
@@ -2227,11 +2223,11 @@ public async Task Example_ExportProject_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -2239,25 +2235,24 @@ public async Task Example_ExportProject_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_ImportProject()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                projectFileVersion = "<projectFileVersion>",
-                stringIndexType = "Utf16CodeUnit",
-                metadata = new
+                ["projectFileVersion"] = "<projectFileVersion>",
+                ["stringIndexType"] = "Utf16CodeUnit",
+                ["metadata"] = new Dictionary<string, object>()
                 {
-                    projectKind = "Conversation",
-                    projectName = "<projectName>",
-                    language = "<language>",
+                    ["projectKind"] = "Conversation",
+                    ["projectName"] = "<projectName>",
+                    ["language"] = "<language>",
                 },
-            };
-
-            var operation = client.ImportProject(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.ImportProject(WaitUntil.Completed, "<projectName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2269,93 +2264,112 @@ public void Example_ImportProject()
         [Ignore("Only validating compilation of examples")]
         public void Example_ImportProject_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                projectFileVersion = "<projectFileVersion>",
-                stringIndexType = "Utf16CodeUnit",
-                metadata = new
+                ["projectFileVersion"] = "<projectFileVersion>",
+                ["stringIndexType"] = "Utf16CodeUnit",
+                ["metadata"] = new Dictionary<string, object>()
                 {
-                    projectKind = "Conversation",
-                    settings = new
+                    ["projectKind"] = "Conversation",
+                    ["settings"] = new Dictionary<string, object>()
                     {
-                        confidenceThreshold = 123.45f,
+                        ["confidenceThreshold"] = 123.45F,
                     },
-                    projectName = "<projectName>",
-                    multilingual = true,
-                    description = "<description>",
-                    language = "<language>",
+                    ["projectName"] = "<projectName>",
+                    ["multilingual"] = true,
+                    ["description"] = "<description>",
+                    ["language"] = "<language>",
                 },
-                assets = new
+                ["assets"] = new Dictionary<string, object>()
                 {
-                    intents = new[] {
-            new {
-                category = "<category>",
-            }
-        },
-                    entities = new[] {
-            new {
-                category = "<category>",
-                compositionSetting = "returnLongestOverlap",
-                list = new {
-                    sublists = new[] {
-                        new {
-                            listKey = "<listKey>",
-                            synonyms = new[] {
-                                new {
-                                    language = "<language>",
-                                    values = new[] {
-                                        "<String>"
-                                    },
-                                }
-                            },
-                        }
-                    },
-                },
-                prebuilts = new[] {
-                    new {
-                        category = "<category>",
-                    }
-                },
-                regex = new {
-                    expressions = new[] {
-                        new {
-                            regexKey = "<regexKey>",
-                            language = "<language>",
-                            regexPattern = "<regexPattern>",
-                        }
-                    },
-                },
-                requiredComponents = new[] {
-                    "<String>"
-                },
-            }
-        },
-                    utterances = new[] {
-            new {
-                entities = new[] {
-                    new {
-                        category = "<category>",
-                        offset = 1234,
-                        length = 1234,
-                    }
-                },
-                text = "<text>",
-                language = "<language>",
-                intent = "<intent>",
-                dataset = "<dataset>",
-            }
-        },
-                    projectKind = "Conversation",
+                    ["intents"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+}
+},
+                    ["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+["compositionSetting"] = "returnLongestOverlap",
+["list"] = new Dictionary<string, object>()
+{
+["sublists"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["listKey"] = "<listKey>",
+["synonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["language"] = "<language>",
+["values"] = new List<object>()
+{
+"<values>"
+},
+}
+},
+}
+},
+},
+["prebuilts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+}
+},
+["regex"] = new Dictionary<string, object>()
+{
+["expressions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["regexKey"] = "<regexKey>",
+["language"] = "<language>",
+["regexPattern"] = "<regexPattern>",
+}
+},
+},
+["requiredComponents"] = new List<object>()
+{
+"<requiredComponents>"
+},
+}
+},
+                    ["utterances"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+["offset"] = 1234,
+["length"] = 1234,
+}
+},
+["text"] = "<text>",
+["language"] = "<language>",
+["intent"] = "<intent>",
+["dataset"] = "<dataset>",
+}
+},
+                    ["projectKind"] = "Conversation",
                 },
-            };
-
-            var operation = client.ImportProject(WaitUntil.Completed, "<projectName>", RequestContent.Create(data), "<exportedProjectFormat>");
-
+            });
+            Operation<BinaryData> operation = client.ImportProject(WaitUntil.Completed, "<projectName>", content, exportedProjectFormat: "Conversation");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2372,11 +2386,11 @@ public void Example_ImportProject_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -2384,25 +2398,24 @@ public void Example_ImportProject_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ImportProject_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                projectFileVersion = "<projectFileVersion>",
-                stringIndexType = "Utf16CodeUnit",
-                metadata = new
+                ["projectFileVersion"] = "<projectFileVersion>",
+                ["stringIndexType"] = "Utf16CodeUnit",
+                ["metadata"] = new Dictionary<string, object>()
                 {
-                    projectKind = "Conversation",
-                    projectName = "<projectName>",
-                    language = "<language>",
+                    ["projectKind"] = "Conversation",
+                    ["projectName"] = "<projectName>",
+                    ["language"] = "<language>",
                 },
-            };
-
-            var operation = await client.ImportProjectAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.ImportProjectAsync(WaitUntil.Completed, "<projectName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2414,93 +2427,112 @@ public async Task Example_ImportProject_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ImportProject_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                projectFileVersion = "<projectFileVersion>",
-                stringIndexType = "Utf16CodeUnit",
-                metadata = new
+                ["projectFileVersion"] = "<projectFileVersion>",
+                ["stringIndexType"] = "Utf16CodeUnit",
+                ["metadata"] = new Dictionary<string, object>()
                 {
-                    projectKind = "Conversation",
-                    settings = new
+                    ["projectKind"] = "Conversation",
+                    ["settings"] = new Dictionary<string, object>()
                     {
-                        confidenceThreshold = 123.45f,
+                        ["confidenceThreshold"] = 123.45F,
                     },
-                    projectName = "<projectName>",
-                    multilingual = true,
-                    description = "<description>",
-                    language = "<language>",
+                    ["projectName"] = "<projectName>",
+                    ["multilingual"] = true,
+                    ["description"] = "<description>",
+                    ["language"] = "<language>",
                 },
-                assets = new
+                ["assets"] = new Dictionary<string, object>()
                 {
-                    intents = new[] {
-            new {
-                category = "<category>",
-            }
-        },
-                    entities = new[] {
-            new {
-                category = "<category>",
-                compositionSetting = "returnLongestOverlap",
-                list = new {
-                    sublists = new[] {
-                        new {
-                            listKey = "<listKey>",
-                            synonyms = new[] {
-                                new {
-                                    language = "<language>",
-                                    values = new[] {
-                                        "<String>"
-                                    },
-                                }
-                            },
-                        }
-                    },
-                },
-                prebuilts = new[] {
-                    new {
-                        category = "<category>",
-                    }
-                },
-                regex = new {
-                    expressions = new[] {
-                        new {
-                            regexKey = "<regexKey>",
-                            language = "<language>",
-                            regexPattern = "<regexPattern>",
-                        }
-                    },
-                },
-                requiredComponents = new[] {
-                    "<String>"
-                },
-            }
-        },
-                    utterances = new[] {
-            new {
-                entities = new[] {
-                    new {
-                        category = "<category>",
-                        offset = 1234,
-                        length = 1234,
-                    }
-                },
-                text = "<text>",
-                language = "<language>",
-                intent = "<intent>",
-                dataset = "<dataset>",
-            }
-        },
-                    projectKind = "Conversation",
+                    ["intents"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+}
+},
+                    ["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+["compositionSetting"] = "returnLongestOverlap",
+["list"] = new Dictionary<string, object>()
+{
+["sublists"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["listKey"] = "<listKey>",
+["synonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["language"] = "<language>",
+["values"] = new List<object>()
+{
+"<values>"
+},
+}
+},
+}
+},
+},
+["prebuilts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+}
+},
+["regex"] = new Dictionary<string, object>()
+{
+["expressions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["regexKey"] = "<regexKey>",
+["language"] = "<language>",
+["regexPattern"] = "<regexPattern>",
+}
+},
+},
+["requiredComponents"] = new List<object>()
+{
+"<requiredComponents>"
+},
+}
+},
+                    ["utterances"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["category"] = "<category>",
+["offset"] = 1234,
+["length"] = 1234,
+}
+},
+["text"] = "<text>",
+["language"] = "<language>",
+["intent"] = "<intent>",
+["dataset"] = "<dataset>",
+}
+},
+                    ["projectKind"] = "Conversation",
                 },
-            };
-
-            var operation = await client.ImportProjectAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data), "<exportedProjectFormat>");
-
+            });
+            Operation<BinaryData> operation = await client.ImportProjectAsync(WaitUntil.Completed, "<projectName>", content, exportedProjectFormat: "Conversation");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2517,11 +2549,11 @@ public async Task Example_ImportProject_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -2529,19 +2561,18 @@ public async Task Example_ImportProject_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_Train()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                modelLabel = "<modelLabel>",
-                trainingMode = "advanced",
-            };
-
-            var operation = client.Train(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
-
+                ["modelLabel"] = "<modelLabel>",
+                ["trainingMode"] = "advanced",
+            });
+            Operation<BinaryData> operation = client.Train(WaitUntil.Completed, "<projectName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
             Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
@@ -2557,26 +2588,25 @@ public void Example_Train()
         [Ignore("Only validating compilation of examples")]
         public void Example_Train_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                modelLabel = "<modelLabel>",
-                trainingConfigVersion = "<trainingConfigVersion>",
-                trainingMode = "advanced",
-                evaluationOptions = new
+                ["modelLabel"] = "<modelLabel>",
+                ["trainingConfigVersion"] = "<trainingConfigVersion>",
+                ["trainingMode"] = "advanced",
+                ["evaluationOptions"] = new Dictionary<string, object>()
                 {
-                    kind = "percentage",
-                    trainingSplitPercentage = 1234,
-                    testingSplitPercentage = 1234,
+                    ["kind"] = "percentage",
+                    ["trainingSplitPercentage"] = 1234,
+                    ["testingSplitPercentage"] = 1234,
                 },
-            };
-
-            var operation = client.Train(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.Train(WaitUntil.Completed, "<projectName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
             Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
@@ -2605,11 +2635,11 @@ public void Example_Train_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -2617,19 +2647,18 @@ public void Example_Train_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Train_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                modelLabel = "<modelLabel>",
-                trainingMode = "advanced",
-            };
-
-            var operation = await client.TrainAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
-
+                ["modelLabel"] = "<modelLabel>",
+                ["trainingMode"] = "advanced",
+            });
+            Operation<BinaryData> operation = await client.TrainAsync(WaitUntil.Completed, "<projectName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
             Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
@@ -2645,26 +2674,25 @@ public async Task Example_Train_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Train_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                modelLabel = "<modelLabel>",
-                trainingConfigVersion = "<trainingConfigVersion>",
-                trainingMode = "advanced",
-                evaluationOptions = new
+                ["modelLabel"] = "<modelLabel>",
+                ["trainingConfigVersion"] = "<trainingConfigVersion>",
+                ["trainingMode"] = "advanced",
+                ["evaluationOptions"] = new Dictionary<string, object>()
                 {
-                    kind = "percentage",
-                    trainingSplitPercentage = 1234,
-                    testingSplitPercentage = 1234,
+                    ["kind"] = "percentage",
+                    ["trainingSplitPercentage"] = 1234,
+                    ["testingSplitPercentage"] = 1234,
                 },
-            };
-
-            var operation = await client.TrainAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.TrainAsync(WaitUntil.Completed, "<projectName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
             Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
@@ -2693,11 +2721,11 @@ public async Task Example_Train_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -2705,19 +2733,18 @@ public async Task Example_Train_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_SwapDeployments()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                firstDeploymentName = "<firstDeploymentName>",
-                secondDeploymentName = "<secondDeploymentName>",
-            };
-
-            var operation = client.SwapDeployments(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
-
+                ["firstDeploymentName"] = "<firstDeploymentName>",
+                ["secondDeploymentName"] = "<secondDeploymentName>",
+            });
+            Operation<BinaryData> operation = client.SwapDeployments(WaitUntil.Completed, "<projectName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2729,19 +2756,18 @@ public void Example_SwapDeployments()
         [Ignore("Only validating compilation of examples")]
         public void Example_SwapDeployments_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                firstDeploymentName = "<firstDeploymentName>",
-                secondDeploymentName = "<secondDeploymentName>",
-            };
-
-            var operation = client.SwapDeployments(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
-
+                ["firstDeploymentName"] = "<firstDeploymentName>",
+                ["secondDeploymentName"] = "<secondDeploymentName>",
+            });
+            Operation<BinaryData> operation = client.SwapDeployments(WaitUntil.Completed, "<projectName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2758,11 +2784,11 @@ public void Example_SwapDeployments_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -2770,19 +2796,18 @@ public void Example_SwapDeployments_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SwapDeployments_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                firstDeploymentName = "<firstDeploymentName>",
-                secondDeploymentName = "<secondDeploymentName>",
-            };
-
-            var operation = await client.SwapDeploymentsAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
-
+                ["firstDeploymentName"] = "<firstDeploymentName>",
+                ["secondDeploymentName"] = "<secondDeploymentName>",
+            });
+            Operation<BinaryData> operation = await client.SwapDeploymentsAsync(WaitUntil.Completed, "<projectName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2794,19 +2819,18 @@ public async Task Example_SwapDeployments_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SwapDeployments_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                firstDeploymentName = "<firstDeploymentName>",
-                secondDeploymentName = "<secondDeploymentName>",
-            };
-
-            var operation = await client.SwapDeploymentsAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
-
+                ["firstDeploymentName"] = "<firstDeploymentName>",
+                ["secondDeploymentName"] = "<secondDeploymentName>",
+            });
+            Operation<BinaryData> operation = await client.SwapDeploymentsAsync(WaitUntil.Completed, "<projectName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2823,11 +2847,11 @@ public async Task Example_SwapDeployments_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -2835,18 +2859,17 @@ public async Task Example_SwapDeployments_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeployProject()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                trainedModelLabel = "<trainedModelLabel>",
-            };
-
-            var operation = client.DeployProject(WaitUntil.Completed, "<projectName>", "<deploymentName>", RequestContent.Create(data));
-
+                ["trainedModelLabel"] = "<trainedModelLabel>",
+            });
+            Operation<BinaryData> operation = client.DeployProject(WaitUntil.Completed, "<projectName>", "<deploymentName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("deploymentName").ToString());
             Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -2860,18 +2883,17 @@ public void Example_DeployProject()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeployProject_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                trainedModelLabel = "<trainedModelLabel>",
-            };
-
-            var operation = client.DeployProject(WaitUntil.Completed, "<projectName>", "<deploymentName>", RequestContent.Create(data));
-
+                ["trainedModelLabel"] = "<trainedModelLabel>",
+            });
+            Operation<BinaryData> operation = client.DeployProject(WaitUntil.Completed, "<projectName>", "<deploymentName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("deploymentName").ToString());
             Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -2885,18 +2907,17 @@ public void Example_DeployProject_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeployProject_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                trainedModelLabel = "<trainedModelLabel>",
-            };
-
-            var operation = await client.DeployProjectAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>", RequestContent.Create(data));
-
+                ["trainedModelLabel"] = "<trainedModelLabel>",
+            });
+            Operation<BinaryData> operation = await client.DeployProjectAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("deploymentName").ToString());
             Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -2910,18 +2931,17 @@ public async Task Example_DeployProject_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeployProject_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                trainedModelLabel = "<trainedModelLabel>",
-            };
-
-            var operation = await client.DeployProjectAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>", RequestContent.Create(data));
-
+                ["trainedModelLabel"] = "<trainedModelLabel>",
+            });
+            Operation<BinaryData> operation = await client.DeployProjectAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("deploymentName").ToString());
             Console.WriteLine(result.GetProperty("modelId").ToString());
@@ -2935,13 +2955,13 @@ public async Task Example_DeployProject_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteDeployment()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = client.DeleteDeployment(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.DeleteDeployment(WaitUntil.Completed, "<projectName>", "<deploymentName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2953,13 +2973,13 @@ public void Example_DeleteDeployment()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteDeployment_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = client.DeleteDeployment(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.DeleteDeployment(WaitUntil.Completed, "<projectName>", "<deploymentName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -2976,11 +2996,11 @@ public void Example_DeleteDeployment_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -2988,13 +3008,13 @@ public void Example_DeleteDeployment_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteDeployment_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = await client.DeleteDeploymentAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.DeleteDeploymentAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -3006,13 +3026,13 @@ public async Task Example_DeleteDeployment_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteDeployment_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = await client.DeleteDeploymentAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.DeleteDeploymentAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -3029,11 +3049,11 @@ public async Task Example_DeleteDeployment_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -3041,65 +3061,57 @@ public async Task Example_DeleteDeployment_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_LoadSnapshot()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var operation = client.LoadSnapshot(WaitUntil.Completed, "<projectName>", "<trainedModelLabel>");
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.LoadSnapshot(WaitUntil.Completed, "<projectName>", "<trainedModelLabel>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_LoadSnapshot_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = client.LoadSnapshot(WaitUntil.Completed, "<projectName>", "<trainedModelLabel>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.LoadSnapshot(WaitUntil.Completed, "<projectName>", "<trainedModelLabel>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_LoadSnapshot_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            var operation = await client.LoadSnapshotAsync(WaitUntil.Completed, "<projectName>", "<trainedModelLabel>");
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.LoadSnapshotAsync(WaitUntil.Completed, "<projectName>", "<trainedModelLabel>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_LoadSnapshot_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = await client.LoadSnapshotAsync(WaitUntil.Completed, "<projectName>", "<trainedModelLabel>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.LoadSnapshotAsync(WaitUntil.Completed, "<projectName>", "<trainedModelLabel>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CancelTrainingJob()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = client.CancelTrainingJob(WaitUntil.Completed, "<projectName>", "<jobId>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.CancelTrainingJob(WaitUntil.Completed, "<projectName>", "<jobId>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
             Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
@@ -3115,13 +3127,13 @@ public void Example_CancelTrainingJob()
         [Ignore("Only validating compilation of examples")]
         public void Example_CancelTrainingJob_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = client.CancelTrainingJob(WaitUntil.Completed, "<projectName>", "<jobId>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.CancelTrainingJob(WaitUntil.Completed, "<projectName>", "<jobId>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
             Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
@@ -3150,11 +3162,11 @@ public void Example_CancelTrainingJob_AllParameters()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
 
@@ -3162,13 +3174,13 @@ public void Example_CancelTrainingJob_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CancelTrainingJob_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = await client.CancelTrainingJobAsync(WaitUntil.Completed, "<projectName>", "<jobId>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.CancelTrainingJobAsync(WaitUntil.Completed, "<projectName>", "<jobId>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
             Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
@@ -3184,13 +3196,13 @@ public async Task Example_CancelTrainingJob_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CancelTrainingJob_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConversationAuthoringClient(endpoint, credential);
-
-            var operation = await client.CancelTrainingJobAsync(WaitUntil.Completed, "<projectName>", "<jobId>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ConversationAuthoringClient client = new ConversationAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.CancelTrainingJobAsync(WaitUntil.Completed, "<projectName>", "<jobId>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("result").GetProperty("modelLabel").ToString());
             Console.WriteLine(result.GetProperty("result").GetProperty("trainingConfigVersion").ToString());
@@ -3219,11 +3231,11 @@ public async Task Example_CancelTrainingJob_AllParameters_Async()
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("details")[0].GetProperty("innererror").GetProperty("target").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("code").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("details").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errors")[0].GetProperty("innererror").GetProperty("target").ToString());
         }
     }
diff --git a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Docs/QuestionAnsweringAuthoringClient.xml b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Docs/QuestionAnsweringAuthoringClient.xml
index 727b8b5fc973..38db2dd1d92f 100644
--- a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Docs/QuestionAnsweringAuthoringClient.xml
+++ b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/src/Generated/Docs/QuestionAnsweringAuthoringClient.xml
@@ -2,12 +2,23 @@
 <doc>
   <members>
     <member name="GetProjectDetailsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetProjectDetailsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetProjectDetailsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+
+Response response = await client.GetProjectDetailsAsync("<projectName>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetProjectDetailsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
 Response response = await client.GetProjectDetailsAsync("<projectName>");
 
@@ -20,22 +31,26 @@ Console.WriteLine(result.GetProperty("settings").GetProperty("defaultAnswer").To
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-project-details
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetProjectDetails(string,RequestContext)">
-<example>
-This sample shows how to call GetProjectDetails with required parameters and parse the result.
+      <example>
+This sample shows how to call GetProjectDetails and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+
+Response response = client.GetProjectDetails("<projectName>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetProjectDetails with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
 Response response = client.GetProjectDetails("<projectName>");
 
@@ -48,48 +63,42 @@ Console.WriteLine(result.GetProperty("settings").GetProperty("defaultAnswer").To
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-project-details
-
-</remarks>
+]]></code></example>
     </member>
     <member name="CreateProjectAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateProjectAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateProjectAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new {
-    language = "<language>",
-};
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Response response = await client.CreateProjectAsync("<projectName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["language"] = "<language>",
+});
+Response response = await client.CreateProjectAsync("<projectName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateProjectAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new {
-    description = "<description>",
-    language = "<language>",
-    multilingualResource = true,
-    settings = new {
-        defaultAnswer = "<defaultAnswer>",
-    },
-};
+This sample shows how to call CreateProjectAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Response response = await client.CreateProjectAsync("<projectName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["description"] = "<description>",
+    ["language"] = "<language>",
+    ["multilingualResource"] = true,
+    ["settings"] = new Dictionary<string, object>()
+    {
+        ["defaultAnswer"] = "<defaultAnswer>",
+    },
+});
+Response response = await client.CreateProjectAsync("<projectName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("projectName").ToString());
@@ -100,48 +109,42 @@ Console.WriteLine(result.GetProperty("settings").GetProperty("defaultAnswer").To
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/create-project
-
-</remarks>
+]]></code></example>
     </member>
     <member name="CreateProject(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateProject with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateProject and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-var data = new {
-    language = "<language>",
-};
-
-Response response = client.CreateProject("<projectName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["language"] = "<language>",
+});
+Response response = client.CreateProject("<projectName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateProject with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new {
-    description = "<description>",
-    language = "<language>",
-    multilingualResource = true,
-    settings = new {
-        defaultAnswer = "<defaultAnswer>",
-    },
-};
+This sample shows how to call CreateProject with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Response response = client.CreateProject("<projectName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["description"] = "<description>",
+    ["language"] = "<language>",
+    ["multilingualResource"] = true,
+    ["settings"] = new Dictionary<string, object>()
+    {
+        ["defaultAnswer"] = "<defaultAnswer>",
+    },
+});
+Response response = client.CreateProject("<projectName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("projectName").ToString());
@@ -152,1448 +155,1629 @@ Console.WriteLine(result.GetProperty("settings").GetProperty("defaultAnswer").To
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/create-project
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetDeleteStatusAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetDeleteStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeleteStatusAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
 Response response = await client.GetDeleteStatusAsync("<jobId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetDeleteStatusAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-delete-status
+Response response = await client.GetDeleteStatusAsync("<jobId>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code></example>
     </member>
     <member name="GetDeleteStatus(string,RequestContext)">
-<example>
-This sample shows how to call GetDeleteStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeleteStatus and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
 Response response = client.GetDeleteStatus("<jobId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetDeleteStatus with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-delete-status
+Response response = client.GetDeleteStatus("<jobId>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code></example>
     </member>
     <member name="GetExportStatusAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetExportStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetExportStatusAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
 Response response = await client.GetExportStatusAsync("<projectName>", "<jobId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetExportStatusAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-export-status
+Response response = await client.GetExportStatusAsync("<projectName>", "<jobId>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code></example>
     </member>
     <member name="GetExportStatus(string,string,RequestContext)">
-<example>
-This sample shows how to call GetExportStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetExportStatus and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
 Response response = client.GetExportStatus("<projectName>", "<jobId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetExportStatus with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-export-status
+Response response = client.GetExportStatus("<projectName>", "<jobId>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code></example>
     </member>
     <member name="GetImportStatusAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetImportStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetImportStatusAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
 Response response = await client.GetImportStatusAsync("<projectName>", "<jobId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetImportStatusAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-import-status
+Response response = await client.GetImportStatusAsync("<projectName>", "<jobId>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code></example>
     </member>
     <member name="GetImportStatus(string,string,RequestContext)">
-<example>
-This sample shows how to call GetImportStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetImportStatus and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
 Response response = client.GetImportStatus("<projectName>", "<jobId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetImportStatus with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-import-status
+Response response = client.GetImportStatus("<projectName>", "<jobId>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code></example>
     </member>
     <member name="GetDeployStatusAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeployStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeployStatusAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
 Response response = await client.GetDeployStatusAsync("<projectName>", "<deploymentName>", "<jobId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetDeployStatusAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-deploy-status
+Response response = await client.GetDeployStatusAsync("<projectName>", "<deploymentName>", "<jobId>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code></example>
     </member>
     <member name="GetDeployStatus(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeployStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeployStatus and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
 Response response = client.GetDeployStatus("<projectName>", "<deploymentName>", "<jobId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetDeployStatus with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-deploy-status
+Response response = client.GetDeployStatus("<projectName>", "<deploymentName>", "<jobId>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code></example>
     </member>
     <member name="UpdateSynonymsAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateSynonymsAsync with required parameters.
+      <example>
+This sample shows how to call UpdateSynonymsAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-var data = new {};
-
-Response response = await client.UpdateSynonymsAsync("<projectName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.UpdateSynonymsAsync("<projectName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call UpdateSynonymsAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new {
-    value = new[] {
-        new {
-            alterations = new[] {
-                "<String>"
-            },
-        }
-    },
-    nextLink = "<nextLink>",
-};
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Response response = await client.UpdateSynonymsAsync("<projectName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["value"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["alterations"] = new List<object>()
+{
+"<alterations>"
+},
+}
+},
+    ["nextLink"] = "<nextLink>",
+});
+Response response = await client.UpdateSynonymsAsync("<projectName>", content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/update-synonyms
-
-</remarks>
+]]></code></example>
     </member>
     <member name="UpdateSynonyms(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateSynonyms with required parameters.
+      <example>
+This sample shows how to call UpdateSynonyms.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Response response = client.UpdateSynonyms("<projectName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.UpdateSynonyms("<projectName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call UpdateSynonyms with all parameters and request content.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new {
-    value = new[] {
-        new {
-            alterations = new[] {
-                "<String>"
-            },
-        }
-    },
-    nextLink = "<nextLink>",
-};
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Response response = client.UpdateSynonyms("<projectName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["value"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["alterations"] = new List<object>()
+{
+"<alterations>"
+},
+}
+},
+    ["nextLink"] = "<nextLink>",
+});
+Response response = client.UpdateSynonyms("<projectName>", content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/update-synonyms
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetUpdateSourcesStatusAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetUpdateSourcesStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetUpdateSourcesStatusAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
 Response response = await client.GetUpdateSourcesStatusAsync("<projectName>", "<jobId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetUpdateSourcesStatusAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-update-sources-status
+Response response = await client.GetUpdateSourcesStatusAsync("<projectName>", "<jobId>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code></example>
     </member>
     <member name="GetUpdateSourcesStatus(string,string,RequestContext)">
-<example>
-This sample shows how to call GetUpdateSourcesStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetUpdateSourcesStatus and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
 Response response = client.GetUpdateSourcesStatus("<projectName>", "<jobId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetUpdateSourcesStatus with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-update-sources-status
+Response response = client.GetUpdateSourcesStatus("<projectName>", "<jobId>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code></example>
     </member>
     <member name="GetUpdateQnasStatusAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetUpdateQnasStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetUpdateQnasStatusAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
 Response response = await client.GetUpdateQnasStatusAsync("<projectName>", "<jobId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetUpdateQnasStatusAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-update-qnas-status
+Response response = await client.GetUpdateQnasStatusAsync("<projectName>", "<jobId>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code></example>
     </member>
     <member name="GetUpdateQnasStatus(string,string,RequestContext)">
-<example>
-This sample shows how to call GetUpdateQnasStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetUpdateQnasStatus and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
 Response response = client.GetUpdateQnasStatus("<projectName>", "<jobId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call GetUpdateQnasStatus with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-update-qnas-status
+Response response = client.GetUpdateQnasStatus("<projectName>", "<jobId>");
 
-</remarks>
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
+Console.WriteLine(result.GetProperty("jobId").ToString());
+Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code></example>
     </member>
     <member name="AddFeedbackAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call AddFeedbackAsync with required parameters.
+      <example>
+This sample shows how to call AddFeedbackAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-var data = new {};
-
-Response response = await client.AddFeedbackAsync("<projectName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.AddFeedbackAsync("<projectName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call AddFeedbackAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new {
-    records = new[] {
-        new {
-            userId = "<userId>",
-            userQuestion = "<userQuestion>",
-            qnaId = 1234,
-        }
-    },
-};
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Response response = await client.AddFeedbackAsync("<projectName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["records"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["userId"] = "<userId>",
+["userQuestion"] = "<userQuestion>",
+["qnaId"] = 1234,
+}
+},
+});
+Response response = await client.AddFeedbackAsync("<projectName>", content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/add-feedback
-
-</remarks>
+]]></code></example>
     </member>
     <member name="AddFeedback(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call AddFeedback with required parameters.
+      <example>
+This sample shows how to call AddFeedback.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Response response = client.AddFeedback("<projectName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.AddFeedback("<projectName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call AddFeedback with all parameters and request content.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new {
-    records = new[] {
-        new {
-            userId = "<userId>",
-            userQuestion = "<userQuestion>",
-            qnaId = 1234,
-        }
-    },
-};
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Response response = client.AddFeedback("<projectName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["records"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["userId"] = "<userId>",
+["userQuestion"] = "<userQuestion>",
+["qnaId"] = 1234,
+}
+},
+});
+Response response = client.AddFeedback("<projectName>", content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/add-feedback
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetProjectsAsync(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetProjectsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetProjectsAsync())
+await foreach (BinaryData item in client.GetProjectsAsync())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("projectName").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("language").ToString());
-    Console.WriteLine(result.GetProperty("multilingualResource").ToString());
-    Console.WriteLine(result.GetProperty("settings").GetProperty("defaultAnswer").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/list-projects
+This sample shows how to call GetProjectsAsync with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-</remarks>
+await foreach (BinaryData item in client.GetProjectsAsync())
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("projectName").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("language").ToString());
+    Console.WriteLine(result[0].GetProperty("multilingualResource").ToString());
+    Console.WriteLine(result[0].GetProperty("settings").GetProperty("defaultAnswer").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetProjects(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetProjects and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetProjects())
+foreach (BinaryData item in client.GetProjects())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("projectName").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("language").ToString());
-    Console.WriteLine(result.GetProperty("multilingualResource").ToString());
-    Console.WriteLine(result.GetProperty("settings").GetProperty("defaultAnswer").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/list-projects
+This sample shows how to call GetProjects with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-</remarks>
+foreach (BinaryData item in client.GetProjects())
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("projectName").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("language").ToString());
+    Console.WriteLine(result[0].GetProperty("multilingualResource").ToString());
+    Console.WriteLine(result[0].GetProperty("settings").GetProperty("defaultAnswer").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastModifiedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetDeploymentsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetDeploymentsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeploymentsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetDeploymentsAsync("<projectName>"))
+await foreach (BinaryData item in client.GetDeploymentsAsync("<projectName>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deploymentName").ToString());
-    Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/list-deployments
+This sample shows how to call GetDeploymentsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-</remarks>
+await foreach (BinaryData item in client.GetDeploymentsAsync("<projectName>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("deploymentName").ToString());
+    Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetDeployments(string,RequestContext)">
-<example>
-This sample shows how to call GetDeployments with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeployments and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetDeployments("<projectName>"))
+foreach (BinaryData item in client.GetDeployments("<projectName>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deploymentName").ToString());
-    Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/list-deployments
+This sample shows how to call GetDeployments with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-</remarks>
+foreach (BinaryData item in client.GetDeployments("<projectName>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("deploymentName").ToString());
+    Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSynonymsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetSynonymsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSynonymsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetSynonymsAsync("<projectName>"))
+await foreach (BinaryData item in client.GetSynonymsAsync("<projectName>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("alterations")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("alterations")[0].ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-synonyms
+This sample shows how to call GetSynonymsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-</remarks>
+await foreach (BinaryData item in client.GetSynonymsAsync("<projectName>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("alterations")[0].ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSynonyms(string,RequestContext)">
-<example>
-This sample shows how to call GetSynonyms with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSynonyms and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetSynonyms("<projectName>"))
+foreach (BinaryData item in client.GetSynonyms("<projectName>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("alterations")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("alterations")[0].ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-synonyms
+This sample shows how to call GetSynonyms with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-</remarks>
+foreach (BinaryData item in client.GetSynonyms("<projectName>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("alterations")[0].ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSourcesAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetSourcesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSourcesAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetSourcesAsync("<projectName>"))
+await foreach (BinaryData item in client.GetSourcesAsync("<projectName>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("displayName").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("sourceUri").ToString());
-    Console.WriteLine(result.GetProperty("sourceKind").ToString());
-    Console.WriteLine(result.GetProperty("contentStructureKind").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-sources
+This sample shows how to call GetSourcesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-</remarks>
+await foreach (BinaryData item in client.GetSourcesAsync("<projectName>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("displayName").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
+    Console.WriteLine(result[0].GetProperty("contentStructureKind").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSources(string,RequestContext)">
-<example>
-This sample shows how to call GetSources with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSources and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetSources("<projectName>"))
+foreach (BinaryData item in client.GetSources("<projectName>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("displayName").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("sourceUri").ToString());
-    Console.WriteLine(result.GetProperty("sourceKind").ToString());
-    Console.WriteLine(result.GetProperty("contentStructureKind").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-sources
+This sample shows how to call GetSources with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-</remarks>
+foreach (BinaryData item in client.GetSources("<projectName>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("displayName").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
+    Console.WriteLine(result[0].GetProperty("contentStructureKind").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetQnasAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetQnasAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetQnasAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetQnasAsync("<projectName>"))
+await foreach (BinaryData item in client.GetQnasAsync("<projectName>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-This sample shows how to call GetQnasAsync with all parameters, and how to parse the result.
+This sample shows how to call GetQnasAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-await foreach (var item in client.GetQnasAsync("<projectName>", "<source>"))
+await foreach (BinaryData item in client.GetQnasAsync("<projectName>", source: "<source>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("answer").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("questions")[0].ToString());
-    Console.WriteLine(result.GetProperty("metadata").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("isContextOnly").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("answer").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("questions")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("metadata").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("isContextOnly").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
 }
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-qnas
-
-</remarks>
+]]></code></example>
     </member>
     <member name="GetQnas(string,string,RequestContext)">
-<example>
-This sample shows how to call GetQnas with required parameters and parse the result.
+      <example>
+This sample shows how to call GetQnas and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetQnas("<projectName>"))
+foreach (BinaryData item in client.GetQnas("<projectName>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-This sample shows how to call GetQnas with all parameters, and how to parse the result.
+This sample shows how to call GetQnas with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-foreach (var item in client.GetQnas("<projectName>", "<source>"))
+foreach (BinaryData item in client.GetQnas("<projectName>", source: "<source>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("answer").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("questions")[0].ToString());
-    Console.WriteLine(result.GetProperty("metadata").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("isContextOnly").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("answer").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("questions")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("metadata").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("isContextOnly").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
 }
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/get-qnas
-
-</remarks>
+]]></code></example>
     </member>
     <member name="DeleteProjectAsync(WaitUntil,string,RequestContext)">
-<example>
-This sample shows how to call DeleteProjectAsync with required parameters.
+      <example>
+This sample shows how to call DeleteProjectAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var operation = await client.DeleteProjectAsync(WaitUntil.Completed, "<projectName>");
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = await client.DeleteProjectAsync(WaitUntil.Completed, "<projectName>");
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/delete-project
+This sample shows how to call DeleteProjectAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-</remarks>
+Operation operation = await client.DeleteProjectAsync(WaitUntil.Completed, "<projectName>");
+]]></code></example>
     </member>
     <member name="DeleteProject(WaitUntil,string,RequestContext)">
-<example>
-This sample shows how to call DeleteProject with required parameters.
+      <example>
+This sample shows how to call DeleteProject.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-var operation = client.DeleteProject(WaitUntil.Completed, "<projectName>");
-
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = client.DeleteProject(WaitUntil.Completed, "<projectName>");
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/delete-project
+This sample shows how to call DeleteProject with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-</remarks>
+Operation operation = client.DeleteProject(WaitUntil.Completed, "<projectName>");
+]]></code></example>
     </member>
     <member name="ExportAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call ExportAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call ExportAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var operation = await client.ExportAsync(WaitUntil.Completed, "<projectName>");
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+Operation<BinaryData> operation = await client.ExportAsync(WaitUntil.Completed, "<projectName>");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call ExportAsync with all parameters, and how to parse the result.
+This sample shows how to call ExportAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var operation = await client.ExportAsync(WaitUntil.Completed, "<projectName>", "<format>", "<assetKind>");
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+Operation<BinaryData> operation = await client.ExportAsync(WaitUntil.Completed, "<projectName>", format: "json", assetKind: "qnas");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/export
-
-</remarks>
+]]></code></example>
     </member>
     <member name="Export(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call Export with required parameters and parse the result.
+      <example>
+This sample shows how to call Export and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var operation = client.Export(WaitUntil.Completed, "<projectName>");
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+Operation<BinaryData> operation = client.Export(WaitUntil.Completed, "<projectName>");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call Export with all parameters, and how to parse the result.
+This sample shows how to call Export with all parameters and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var operation = client.Export(WaitUntil.Completed, "<projectName>", "<format>", "<assetKind>");
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+Operation<BinaryData> operation = client.Export(WaitUntil.Completed, "<projectName>", format: "json", assetKind: "qnas");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/export
-
-</remarks>
+]]></code></example>
     </member>
     <member name="ImportAsync(WaitUntil,string,RequestContent,string,string,RequestContext)">
-<example>
-This sample shows how to call ImportAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call ImportAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new {};
-
-var operation = await client.ImportAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+RequestContent content = null;
+Operation<BinaryData> operation = await client.ImportAsync(WaitUntil.Completed, "<projectName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call ImportAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new {
-    metadata = new {
-        description = "<description>",
-        language = "<language>",
-        multilingualResource = true,
-        settings = new {
-            defaultAnswer = "<defaultAnswer>",
+This sample shows how to call ImportAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["metadata"] = new Dictionary<string, object>()
+    {
+        ["description"] = "<description>",
+        ["language"] = "<language>",
+        ["multilingualResource"] = true,
+        ["settings"] = new Dictionary<string, object>()
+        {
+            ["defaultAnswer"] = "<defaultAnswer>",
         },
     },
-    assets = new {
-        synonyms = new[] {
-            new {
-                alterations = new[] {
-                    "<String>"
-                },
-            }
-        },
-        qnas = new[] {
-            new {
-                id = 1234,
-                answer = "<answer>",
-                source = "<source>",
-                questions = new[] {
-                    "<String>"
-                },
-                metadata = new {
-                    key = "<String>",
-                },
-                dialog = new {
-                    isContextOnly = true,
-                    prompts = new[] {
-                        new {
-                            displayOrder = 1234,
-                            qnaId = 1234,
-                            qna = new {
-                                id = 1234,
-                                answer = "<answer>",
-                                source = "<source>",
-                                questions = new[] {
-                                    "<String>"
-                                },
-                                metadata = new {
-                                    key = "<String>",
-                                },
-                                activeLearningSuggestions = new[] {
-                                    new {
-                                        clusterHead = "<clusterHead>",
-                                        suggestedQuestions = new[] {
-                                            new {
-                                                question = "<question>",
-                                                userSuggestedCount = 1234,
-                                                autoSuggestedCount = 1234,
-                                            }
-                                        },
-                                    }
-                                },
-                            },
-                            displayText = "<displayText>",
-                        }
-                    },
-                },
-                activeLearningSuggestions = new[] {
-                    new {
-                        clusterHead = "<clusterHead>",
-                        suggestedQuestions = new[] {
-                            new {
-                                question = "<question>",
-                                userSuggestedCount = 1234,
-                                autoSuggestedCount = 1234,
-                            }
-                        },
-                    }
-                },
-            }
-        },
+    ["assets"] = new Dictionary<string, object>()
+    {
+        ["synonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["alterations"] = new List<object>()
+{
+"<alterations>"
+},
+}
+},
+        ["qnas"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = 1234,
+["answer"] = "<answer>",
+["source"] = "<source>",
+["questions"] = new List<object>()
+{
+"<questions>"
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["key"] = "<metadata>",
+},
+["dialog"] = new Dictionary<string, object>()
+{
+["isContextOnly"] = true,
+["prompts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayOrder"] = 1234,
+["qnaId"] = 1234,
+["qna"] = new Dictionary<string, object>()
+{
+["id"] = 1234,
+["answer"] = "<answer>",
+["source"] = "<source>",
+["questions"] = new List<object>()
+{
+"<questions>"
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["key"] = "<metadata>",
+},
+["dialog"] = null
+,
+["activeLearningSuggestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["clusterHead"] = "<clusterHead>",
+["suggestedQuestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["question"] = "<question>",
+["userSuggestedCount"] = 1234,
+["autoSuggestedCount"] = 1234,
+}
+},
+}
+},
+},
+["displayText"] = "<displayText>",
+}
+},
+},
+["activeLearningSuggestions"] = new List<object>()
+{
+null
+},
+}
+},
     },
-    fileUri = "<fileUri>",
-};
-
-var operation = await client.ImportAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data), "<format>", "<assetKind>");
-
+    ["fileUri"] = "<fileUri>",
+});
+Operation<BinaryData> operation = await client.ImportAsync(WaitUntil.Completed, "<projectName>", content, format: "json", assetKind: "qnas");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/import
-
-</remarks>
+]]></code></example>
     </member>
     <member name="Import(WaitUntil,string,RequestContent,string,string,RequestContext)">
-<example>
-This sample shows how to call Import with required parameters and parse the result.
+      <example>
+This sample shows how to call Import and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new {};
-
-var operation = client.Import(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+RequestContent content = null;
+Operation<BinaryData> operation = client.Import(WaitUntil.Completed, "<projectName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call Import with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new {
-    metadata = new {
-        description = "<description>",
-        language = "<language>",
-        multilingualResource = true,
-        settings = new {
-            defaultAnswer = "<defaultAnswer>",
+This sample shows how to call Import with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["metadata"] = new Dictionary<string, object>()
+    {
+        ["description"] = "<description>",
+        ["language"] = "<language>",
+        ["multilingualResource"] = true,
+        ["settings"] = new Dictionary<string, object>()
+        {
+            ["defaultAnswer"] = "<defaultAnswer>",
         },
     },
-    assets = new {
-        synonyms = new[] {
-            new {
-                alterations = new[] {
-                    "<String>"
-                },
-            }
-        },
-        qnas = new[] {
-            new {
-                id = 1234,
-                answer = "<answer>",
-                source = "<source>",
-                questions = new[] {
-                    "<String>"
-                },
-                metadata = new {
-                    key = "<String>",
-                },
-                dialog = new {
-                    isContextOnly = true,
-                    prompts = new[] {
-                        new {
-                            displayOrder = 1234,
-                            qnaId = 1234,
-                            qna = new {
-                                id = 1234,
-                                answer = "<answer>",
-                                source = "<source>",
-                                questions = new[] {
-                                    "<String>"
-                                },
-                                metadata = new {
-                                    key = "<String>",
-                                },
-                                activeLearningSuggestions = new[] {
-                                    new {
-                                        clusterHead = "<clusterHead>",
-                                        suggestedQuestions = new[] {
-                                            new {
-                                                question = "<question>",
-                                                userSuggestedCount = 1234,
-                                                autoSuggestedCount = 1234,
-                                            }
-                                        },
-                                    }
-                                },
-                            },
-                            displayText = "<displayText>",
-                        }
-                    },
-                },
-                activeLearningSuggestions = new[] {
-                    new {
-                        clusterHead = "<clusterHead>",
-                        suggestedQuestions = new[] {
-                            new {
-                                question = "<question>",
-                                userSuggestedCount = 1234,
-                                autoSuggestedCount = 1234,
-                            }
-                        },
-                    }
-                },
-            }
-        },
+    ["assets"] = new Dictionary<string, object>()
+    {
+        ["synonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["alterations"] = new List<object>()
+{
+"<alterations>"
+},
+}
+},
+        ["qnas"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = 1234,
+["answer"] = "<answer>",
+["source"] = "<source>",
+["questions"] = new List<object>()
+{
+"<questions>"
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["key"] = "<metadata>",
+},
+["dialog"] = new Dictionary<string, object>()
+{
+["isContextOnly"] = true,
+["prompts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayOrder"] = 1234,
+["qnaId"] = 1234,
+["qna"] = new Dictionary<string, object>()
+{
+["id"] = 1234,
+["answer"] = "<answer>",
+["source"] = "<source>",
+["questions"] = new List<object>()
+{
+"<questions>"
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["key"] = "<metadata>",
+},
+["dialog"] = null
+,
+["activeLearningSuggestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["clusterHead"] = "<clusterHead>",
+["suggestedQuestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["question"] = "<question>",
+["userSuggestedCount"] = 1234,
+["autoSuggestedCount"] = 1234,
+}
+},
+}
+},
+},
+["displayText"] = "<displayText>",
+}
+},
+},
+["activeLearningSuggestions"] = new List<object>()
+{
+null
+},
+}
+},
     },
-    fileUri = "<fileUri>",
-};
-
-var operation = client.Import(WaitUntil.Completed, "<projectName>", RequestContent.Create(data), "<format>", "<assetKind>");
-
+    ["fileUri"] = "<fileUri>",
+});
+Operation<BinaryData> operation = client.Import(WaitUntil.Completed, "<projectName>", content, format: "json", assetKind: "qnas");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("lastUpdatedDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/import
-
-</remarks>
+]]></code></example>
     </member>
     <member name="DeployProjectAsync(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call DeployProjectAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeployProjectAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var operation = await client.DeployProjectAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+Operation<BinaryData> operation = await client.DeployProjectAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
-Console.WriteLine(result.GetProperty("deploymentName").ToString());
-Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+Console.WriteLine(result.ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call DeployProjectAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/deploy-project
+Operation<BinaryData> operation = await client.DeployProjectAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+BinaryData responseData = operation.Value;
 
-</remarks>
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("deploymentName").ToString());
+Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+]]></code></example>
     </member>
     <member name="DeployProject(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call DeployProject with required parameters and parse the result.
+      <example>
+This sample shows how to call DeployProject and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var operation = client.DeployProject(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+Operation<BinaryData> operation = client.DeployProject(WaitUntil.Completed, "<projectName>", "<deploymentName>");
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
-Console.WriteLine(result.GetProperty("deploymentName").ToString());
-Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+Console.WriteLine(result.ToString());
 ]]></code>
-</example>
-<remarks>
+This sample shows how to call DeployProject with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/deploy-project
+Operation<BinaryData> operation = client.DeployProject(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+BinaryData responseData = operation.Value;
 
-</remarks>
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("deploymentName").ToString());
+Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+]]></code></example>
     </member>
     <member name="UpdateSourcesAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateSourcesAsync with required parameters and request content and parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new[] {
-    new {
-        op = "add",
-        value = new {
-            displayName = "<displayName>",
-            source = "<source>",
-            sourceUri = "http://localhost:3000",
-            sourceKind = "file",
-            contentStructureKind = "unstructured",
-        },
-    }
-};
-
-var operation = await client.UpdateSourcesAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+      <example>
+This sample shows how to call UpdateSourcesAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-await foreach (var item in operation.Value)
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>()
+{
+["sourceUri"] = "http://localhost:3000",
+["sourceKind"] = "file",
+},
+}
+});
+Operation<AsyncPageable<BinaryData>> operation = await client.UpdateSourcesAsync(WaitUntil.Completed, "<projectName>", content);
+await foreach (BinaryData item in operation.Value)
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("displayName").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("sourceUri").ToString());
-    Console.WriteLine(result.GetProperty("sourceKind").ToString());
-    Console.WriteLine(result.GetProperty("contentStructureKind").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/update-sources
+This sample shows how to call UpdateSourcesAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-</remarks>
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["source"] = "<source>",
+["sourceUri"] = "http://localhost:3000",
+["sourceKind"] = "file",
+["contentStructureKind"] = "unstructured",
+},
+}
+});
+Operation<AsyncPageable<BinaryData>> operation = await client.UpdateSourcesAsync(WaitUntil.Completed, "<projectName>", content);
+await foreach (BinaryData item in operation.Value)
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("displayName").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
+    Console.WriteLine(result[0].GetProperty("contentStructureKind").ToString());
+}
+]]></code></example>
     </member>
     <member name="UpdateSources(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateSources with required parameters and request content and parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new[] {
-    new {
-        op = "add",
-        value = new {
-            displayName = "<displayName>",
-            source = "<source>",
-            sourceUri = "http://localhost:3000",
-            sourceKind = "file",
-            contentStructureKind = "unstructured",
-        },
-    }
-};
-
-var operation = client.UpdateSources(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+      <example>
+This sample shows how to call UpdateSources and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-foreach (var item in operation.Value)
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>()
+{
+["sourceUri"] = "http://localhost:3000",
+["sourceKind"] = "file",
+},
+}
+});
+Operation<Pageable<BinaryData>> operation = client.UpdateSources(WaitUntil.Completed, "<projectName>", content);
+foreach (BinaryData item in operation.Value)
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("displayName").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("sourceUri").ToString());
-    Console.WriteLine(result.GetProperty("sourceKind").ToString());
-    Console.WriteLine(result.GetProperty("contentStructureKind").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/update-sources
+This sample shows how to call UpdateSources with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-</remarks>
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["source"] = "<source>",
+["sourceUri"] = "http://localhost:3000",
+["sourceKind"] = "file",
+["contentStructureKind"] = "unstructured",
+},
+}
+});
+Operation<Pageable<BinaryData>> operation = client.UpdateSources(WaitUntil.Completed, "<projectName>", content);
+foreach (BinaryData item in operation.Value)
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("displayName").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
+    Console.WriteLine(result[0].GetProperty("contentStructureKind").ToString());
+}
+]]></code></example>
     </member>
     <member name="UpdateQnasAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateQnasAsync with required parameters and request content and parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new[] {
-    new {
-        op = "add",
-        value = new {
-            id = 1234,
-            answer = "<answer>",
-            source = "<source>",
-            questions = new[] {
-                "<String>"
-            },
-            metadata = new {
-                key = "<String>",
-            },
-            dialog = new {
-                isContextOnly = true,
-                prompts = new[] {
-                    new {
-                        displayOrder = 1234,
-                        qnaId = 1234,
-                        displayText = "<displayText>",
-                    }
-                },
-            },
-            activeLearningSuggestions = new[] {
-                new {
-                    clusterHead = "<clusterHead>",
-                    suggestedQuestions = new[] {
-                        new {
-                            question = "<question>",
-                            userSuggestedCount = 1234,
-                            autoSuggestedCount = 1234,
-                        }
-                    },
-                }
-            },
-        },
-    }
-};
-
-var operation = await client.UpdateQnasAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+      <example>
+This sample shows how to call UpdateQnasAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-await foreach (var item in operation.Value)
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>(),
+}
+});
+Operation<AsyncPageable<BinaryData>> operation = await client.UpdateQnasAsync(WaitUntil.Completed, "<projectName>", content);
+await foreach (BinaryData item in operation.Value)
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("answer").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("questions")[0].ToString());
-    Console.WriteLine(result.GetProperty("metadata").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("isContextOnly").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/update-qnas
+This sample shows how to call UpdateQnasAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-</remarks>
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>()
+{
+["id"] = 1234,
+["answer"] = "<answer>",
+["source"] = "<source>",
+["questions"] = new List<object>()
+{
+"<questions>"
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["key"] = "<metadata>",
+},
+["dialog"] = new Dictionary<string, object>()
+{
+["isContextOnly"] = true,
+["prompts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayOrder"] = 1234,
+["qnaId"] = 1234,
+["qna"] = null
+,
+["displayText"] = "<displayText>",
+}
+},
+},
+["activeLearningSuggestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["clusterHead"] = "<clusterHead>",
+["suggestedQuestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["question"] = "<question>",
+["userSuggestedCount"] = 1234,
+["autoSuggestedCount"] = 1234,
+}
+},
+}
+},
+},
+}
+});
+Operation<AsyncPageable<BinaryData>> operation = await client.UpdateQnasAsync(WaitUntil.Completed, "<projectName>", content);
+await foreach (BinaryData item in operation.Value)
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("answer").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("questions")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("metadata").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("isContextOnly").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+}
+]]></code></example>
     </member>
     <member name="UpdateQnas(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateQnas with required parameters and request content and parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-var data = new[] {
-    new {
-        op = "add",
-        value = new {
-            id = 1234,
-            answer = "<answer>",
-            source = "<source>",
-            questions = new[] {
-                "<String>"
-            },
-            metadata = new {
-                key = "<String>",
-            },
-            dialog = new {
-                isContextOnly = true,
-                prompts = new[] {
-                    new {
-                        displayOrder = 1234,
-                        qnaId = 1234,
-                        displayText = "<displayText>",
-                    }
-                },
-            },
-            activeLearningSuggestions = new[] {
-                new {
-                    clusterHead = "<clusterHead>",
-                    suggestedQuestions = new[] {
-                        new {
-                            question = "<question>",
-                            userSuggestedCount = 1234,
-                            autoSuggestedCount = 1234,
-                        }
-                    },
-                }
-            },
-        },
-    }
-};
-
-var operation = client.UpdateQnas(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+      <example>
+This sample shows how to call UpdateQnas and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-foreach (var item in operation.Value)
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>(),
+}
+});
+Operation<Pageable<BinaryData>> operation = client.UpdateQnas(WaitUntil.Completed, "<projectName>", content);
+foreach (BinaryData item in operation.Value)
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("answer").ToString());
-    Console.WriteLine(result.GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("questions")[0].ToString());
-    Console.WriteLine(result.GetProperty("metadata").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("isContextOnly").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
-    Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-    Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
-<remarks>
-
-Additional information can be found in the service REST API documentation:
-https://learn.microsoft.com/rest/api/cognitiveservices/questionanswering/question-answering-projects/update-qnas
+This sample shows how to call UpdateQnas with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-</remarks>
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>()
+{
+["id"] = 1234,
+["answer"] = "<answer>",
+["source"] = "<source>",
+["questions"] = new List<object>()
+{
+"<questions>"
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["key"] = "<metadata>",
+},
+["dialog"] = new Dictionary<string, object>()
+{
+["isContextOnly"] = true,
+["prompts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayOrder"] = 1234,
+["qnaId"] = 1234,
+["qna"] = null
+,
+["displayText"] = "<displayText>",
+}
+},
+},
+["activeLearningSuggestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["clusterHead"] = "<clusterHead>",
+["suggestedQuestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["question"] = "<question>",
+["userSuggestedCount"] = 1234,
+["autoSuggestedCount"] = 1234,
+}
+},
+}
+},
+},
+}
+});
+Operation<Pageable<BinaryData>> operation = client.UpdateQnas(WaitUntil.Completed, "<projectName>", content);
+foreach (BinaryData item in operation.Value)
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("answer").ToString());
+    Console.WriteLine(result[0].GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("questions")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("metadata").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("isContextOnly").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/tests/Generated/Samples/Samples_QuestionAnsweringAuthoringClient.cs b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/tests/Generated/Samples/Samples_QuestionAnsweringAuthoringClient.cs
index e1f214c3286c..fc46ab119997 100644
--- a/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/tests/Generated/Samples/Samples_QuestionAnsweringAuthoringClient.cs
+++ b/sdk/cognitivelanguage/Azure.AI.Language.QuestionAnswering/tests/Generated/Samples/Samples_QuestionAnsweringAuthoringClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.AI.Language.QuestionAnswering.Authoring;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,9 +23,9 @@ public class Samples_QuestionAnsweringAuthoringClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProjectDetails()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = client.GetProjectDetails("<projectName>");
 
@@ -37,9 +37,9 @@ public void Example_GetProjectDetails()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProjectDetails_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = client.GetProjectDetails("<projectName>");
 
@@ -58,9 +58,9 @@ public void Example_GetProjectDetails_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProjectDetails_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = await client.GetProjectDetailsAsync("<projectName>");
 
@@ -72,9 +72,9 @@ public async Task Example_GetProjectDetails_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProjectDetails_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = await client.GetProjectDetailsAsync("<projectName>");
 
@@ -93,16 +93,15 @@ public async Task Example_GetProjectDetails_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateProject()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                language = "<language>",
-            };
-
-            Response response = client.CreateProject("<projectName>", RequestContent.Create(data));
+                ["language"] = "<language>",
+            });
+            Response response = client.CreateProject("<projectName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -112,22 +111,21 @@ public void Example_CreateProject()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateProject_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                description = "<description>",
-                language = "<language>",
-                multilingualResource = true,
-                settings = new
+                ["description"] = "<description>",
+                ["language"] = "<language>",
+                ["multilingualResource"] = true,
+                ["settings"] = new Dictionary<string, object>()
                 {
-                    defaultAnswer = "<defaultAnswer>",
+                    ["defaultAnswer"] = "<defaultAnswer>",
                 },
-            };
-
-            Response response = client.CreateProject("<projectName>", RequestContent.Create(data));
+            });
+            Response response = client.CreateProject("<projectName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("projectName").ToString());
@@ -144,16 +142,15 @@ public void Example_CreateProject_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateProject_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                language = "<language>",
-            };
-
-            Response response = await client.CreateProjectAsync("<projectName>", RequestContent.Create(data));
+                ["language"] = "<language>",
+            });
+            Response response = await client.CreateProjectAsync("<projectName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -163,22 +160,21 @@ public async Task Example_CreateProject_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateProject_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                description = "<description>",
-                language = "<language>",
-                multilingualResource = true,
-                settings = new
+                ["description"] = "<description>",
+                ["language"] = "<language>",
+                ["multilingualResource"] = true,
+                ["settings"] = new Dictionary<string, object>()
                 {
-                    defaultAnswer = "<defaultAnswer>",
+                    ["defaultAnswer"] = "<defaultAnswer>",
                 },
-            };
-
-            Response response = await client.CreateProjectAsync("<projectName>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateProjectAsync("<projectName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("projectName").ToString());
@@ -195,9 +191,9 @@ public async Task Example_CreateProject_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeleteStatus()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = client.GetDeleteStatus("<jobId>");
 
@@ -212,9 +208,9 @@ public void Example_GetDeleteStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeleteStatus_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = client.GetDeleteStatus("<jobId>");
 
@@ -230,9 +226,9 @@ public void Example_GetDeleteStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeleteStatus_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = await client.GetDeleteStatusAsync("<jobId>");
 
@@ -247,9 +243,9 @@ public async Task Example_GetDeleteStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeleteStatus_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = await client.GetDeleteStatusAsync("<jobId>");
 
@@ -265,9 +261,9 @@ public async Task Example_GetDeleteStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetExportStatus()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = client.GetExportStatus("<projectName>", "<jobId>");
 
@@ -282,9 +278,9 @@ public void Example_GetExportStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetExportStatus_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = client.GetExportStatus("<projectName>", "<jobId>");
 
@@ -300,9 +296,9 @@ public void Example_GetExportStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetExportStatus_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = await client.GetExportStatusAsync("<projectName>", "<jobId>");
 
@@ -317,9 +313,9 @@ public async Task Example_GetExportStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetExportStatus_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = await client.GetExportStatusAsync("<projectName>", "<jobId>");
 
@@ -335,9 +331,9 @@ public async Task Example_GetExportStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetImportStatus()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = client.GetImportStatus("<projectName>", "<jobId>");
 
@@ -352,9 +348,9 @@ public void Example_GetImportStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetImportStatus_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = client.GetImportStatus("<projectName>", "<jobId>");
 
@@ -370,9 +366,9 @@ public void Example_GetImportStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetImportStatus_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = await client.GetImportStatusAsync("<projectName>", "<jobId>");
 
@@ -387,9 +383,9 @@ public async Task Example_GetImportStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetImportStatus_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = await client.GetImportStatusAsync("<projectName>", "<jobId>");
 
@@ -405,9 +401,9 @@ public async Task Example_GetImportStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeployStatus()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = client.GetDeployStatus("<projectName>", "<deploymentName>", "<jobId>");
 
@@ -422,9 +418,9 @@ public void Example_GetDeployStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeployStatus_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = client.GetDeployStatus("<projectName>", "<deploymentName>", "<jobId>");
 
@@ -440,9 +436,9 @@ public void Example_GetDeployStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeployStatus_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = await client.GetDeployStatusAsync("<projectName>", "<deploymentName>", "<jobId>");
 
@@ -457,9 +453,9 @@ public async Task Example_GetDeployStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeployStatus_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = await client.GetDeployStatusAsync("<projectName>", "<deploymentName>", "<jobId>");
 
@@ -475,13 +471,12 @@ public async Task Example_GetDeployStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateSynonyms()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = client.UpdateSynonyms("<projectName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.UpdateSynonyms("<projectName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -489,23 +484,25 @@ public void Example_UpdateSynonyms()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateSynonyms_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                value = new[] {
-        new {
-            alterations = new[] {
-                "<String>"
-            },
-        }
-    },
-                nextLink = "<nextLink>",
-            };
-
-            Response response = client.UpdateSynonyms("<projectName>", RequestContent.Create(data));
+                ["value"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["alterations"] = new List<object>()
+{
+"<alterations>"
+},
+}
+},
+                ["nextLink"] = "<nextLink>",
+            });
+            Response response = client.UpdateSynonyms("<projectName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -513,13 +510,12 @@ public void Example_UpdateSynonyms_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateSynonyms_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            Response response = await client.UpdateSynonymsAsync("<projectName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.UpdateSynonymsAsync("<projectName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -527,23 +523,25 @@ public async Task Example_UpdateSynonyms_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateSynonyms_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                value = new[] {
-        new {
-            alterations = new[] {
-                "<String>"
-            },
-        }
-    },
-                nextLink = "<nextLink>",
-            };
-
-            Response response = await client.UpdateSynonymsAsync("<projectName>", RequestContent.Create(data));
+                ["value"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["alterations"] = new List<object>()
+{
+"<alterations>"
+},
+}
+},
+                ["nextLink"] = "<nextLink>",
+            });
+            Response response = await client.UpdateSynonymsAsync("<projectName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -551,9 +549,9 @@ public async Task Example_UpdateSynonyms_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpdateSourcesStatus()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = client.GetUpdateSourcesStatus("<projectName>", "<jobId>");
 
@@ -568,9 +566,9 @@ public void Example_GetUpdateSourcesStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpdateSourcesStatus_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = client.GetUpdateSourcesStatus("<projectName>", "<jobId>");
 
@@ -586,9 +584,9 @@ public void Example_GetUpdateSourcesStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpdateSourcesStatus_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = await client.GetUpdateSourcesStatusAsync("<projectName>", "<jobId>");
 
@@ -603,9 +601,9 @@ public async Task Example_GetUpdateSourcesStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpdateSourcesStatus_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = await client.GetUpdateSourcesStatusAsync("<projectName>", "<jobId>");
 
@@ -621,9 +619,9 @@ public async Task Example_GetUpdateSourcesStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpdateQnasStatus()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = client.GetUpdateQnasStatus("<projectName>", "<jobId>");
 
@@ -638,9 +636,9 @@ public void Example_GetUpdateQnasStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpdateQnasStatus_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = client.GetUpdateQnasStatus("<projectName>", "<jobId>");
 
@@ -656,9 +654,9 @@ public void Example_GetUpdateQnasStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpdateQnasStatus_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = await client.GetUpdateQnasStatusAsync("<projectName>", "<jobId>");
 
@@ -673,9 +671,9 @@ public async Task Example_GetUpdateQnasStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpdateQnasStatus_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
             Response response = await client.GetUpdateQnasStatusAsync("<projectName>", "<jobId>");
 
@@ -691,13 +689,12 @@ public async Task Example_GetUpdateQnasStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddFeedback()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            Response response = client.AddFeedback("<projectName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.AddFeedback("<projectName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -705,22 +702,23 @@ public void Example_AddFeedback()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddFeedback_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                records = new[] {
-        new {
-            userId = "<userId>",
-            userQuestion = "<userQuestion>",
-            qnaId = 1234,
-        }
-    },
-            };
-
-            Response response = client.AddFeedback("<projectName>", RequestContent.Create(data));
+                ["records"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["userId"] = "<userId>",
+["userQuestion"] = "<userQuestion>",
+["qnaId"] = 1234,
+}
+},
+            });
+            Response response = client.AddFeedback("<projectName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -728,13 +726,12 @@ public void Example_AddFeedback_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddFeedback_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            Response response = await client.AddFeedbackAsync("<projectName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.AddFeedbackAsync("<projectName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -742,22 +739,23 @@ public async Task Example_AddFeedback_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddFeedback_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                records = new[] {
-        new {
-            userId = "<userId>",
-            userQuestion = "<userQuestion>",
-            qnaId = 1234,
-        }
-    },
-            };
-
-            Response response = await client.AddFeedbackAsync("<projectName>", RequestContent.Create(data));
+                ["records"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["userId"] = "<userId>",
+["userQuestion"] = "<userQuestion>",
+["qnaId"] = 1234,
+}
+},
+            });
+            Response response = await client.AddFeedbackAsync("<projectName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -765,14 +763,14 @@ public async Task Example_AddFeedback_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProjects()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetProjects())
+            foreach (BinaryData item in client.GetProjects())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -780,21 +778,21 @@ public void Example_GetProjects()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProjects_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetProjects())
+            foreach (BinaryData item in client.GetProjects())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("projectName").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("language").ToString());
-                Console.WriteLine(result.GetProperty("multilingualResource").ToString());
-                Console.WriteLine(result.GetProperty("settings").GetProperty("defaultAnswer").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("projectName").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("language").ToString());
+                Console.WriteLine(result[0].GetProperty("multilingualResource").ToString());
+                Console.WriteLine(result[0].GetProperty("settings").GetProperty("defaultAnswer").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
             }
         }
 
@@ -802,14 +800,14 @@ public void Example_GetProjects_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProjects_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetProjectsAsync())
+            await foreach (BinaryData item in client.GetProjectsAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -817,21 +815,21 @@ public async Task Example_GetProjects_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProjects_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetProjectsAsync())
+            await foreach (BinaryData item in client.GetProjectsAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("projectName").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("language").ToString());
-                Console.WriteLine(result.GetProperty("multilingualResource").ToString());
-                Console.WriteLine(result.GetProperty("settings").GetProperty("defaultAnswer").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("projectName").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("language").ToString());
+                Console.WriteLine(result[0].GetProperty("multilingualResource").ToString());
+                Console.WriteLine(result[0].GetProperty("settings").GetProperty("defaultAnswer").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastModifiedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
             }
         }
 
@@ -839,14 +837,14 @@ public async Task Example_GetProjects_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeployments()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetDeployments("<projectName>"))
+            foreach (BinaryData item in client.GetDeployments("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -854,15 +852,15 @@ public void Example_GetDeployments()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeployments_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetDeployments("<projectName>"))
+            foreach (BinaryData item in client.GetDeployments("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deploymentName").ToString());
-                Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentName").ToString());
+                Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
             }
         }
 
@@ -870,14 +868,14 @@ public void Example_GetDeployments_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeployments_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetDeploymentsAsync("<projectName>"))
+            await foreach (BinaryData item in client.GetDeploymentsAsync("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -885,15 +883,15 @@ public async Task Example_GetDeployments_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeployments_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetDeploymentsAsync("<projectName>"))
+            await foreach (BinaryData item in client.GetDeploymentsAsync("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deploymentName").ToString());
-                Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentName").ToString());
+                Console.WriteLine(result[0].GetProperty("lastDeployedDateTime").ToString());
             }
         }
 
@@ -901,14 +899,14 @@ public async Task Example_GetDeployments_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSynonyms()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetSynonyms("<projectName>"))
+            foreach (BinaryData item in client.GetSynonyms("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("alterations")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("alterations")[0].ToString());
             }
         }
 
@@ -916,14 +914,14 @@ public void Example_GetSynonyms()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSynonyms_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetSynonyms("<projectName>"))
+            foreach (BinaryData item in client.GetSynonyms("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("alterations")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("alterations")[0].ToString());
             }
         }
 
@@ -931,14 +929,14 @@ public void Example_GetSynonyms_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSynonyms_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetSynonymsAsync("<projectName>"))
+            await foreach (BinaryData item in client.GetSynonymsAsync("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("alterations")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("alterations")[0].ToString());
             }
         }
 
@@ -946,14 +944,14 @@ public async Task Example_GetSynonyms_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSynonyms_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetSynonymsAsync("<projectName>"))
+            await foreach (BinaryData item in client.GetSynonymsAsync("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("alterations")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("alterations")[0].ToString());
             }
         }
 
@@ -961,15 +959,15 @@ public async Task Example_GetSynonyms_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSources()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetSources("<projectName>"))
+            foreach (BinaryData item in client.GetSources("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("sourceUri").ToString());
-                Console.WriteLine(result.GetProperty("sourceKind").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
             }
         }
 
@@ -977,18 +975,18 @@ public void Example_GetSources()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSources_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetSources("<projectName>"))
+            foreach (BinaryData item in client.GetSources("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("displayName").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("sourceUri").ToString());
-                Console.WriteLine(result.GetProperty("sourceKind").ToString());
-                Console.WriteLine(result.GetProperty("contentStructureKind").ToString());
+                Console.WriteLine(result[0].GetProperty("displayName").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
+                Console.WriteLine(result[0].GetProperty("contentStructureKind").ToString());
             }
         }
 
@@ -996,15 +994,15 @@ public void Example_GetSources_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSources_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetSourcesAsync("<projectName>"))
+            await foreach (BinaryData item in client.GetSourcesAsync("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("sourceUri").ToString());
-                Console.WriteLine(result.GetProperty("sourceKind").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
             }
         }
 
@@ -1012,18 +1010,18 @@ public async Task Example_GetSources_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSources_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetSourcesAsync("<projectName>"))
+            await foreach (BinaryData item in client.GetSourcesAsync("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("displayName").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("sourceUri").ToString());
-                Console.WriteLine(result.GetProperty("sourceKind").ToString());
-                Console.WriteLine(result.GetProperty("contentStructureKind").ToString());
+                Console.WriteLine(result[0].GetProperty("displayName").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
+                Console.WriteLine(result[0].GetProperty("contentStructureKind").ToString());
             }
         }
 
@@ -1031,14 +1029,14 @@ public async Task Example_GetSources_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetQnas()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetQnas("<projectName>"))
+            foreach (BinaryData item in client.GetQnas("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1046,35 +1044,35 @@ public void Example_GetQnas()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetQnas_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            foreach (var item in client.GetQnas("<projectName>", "<source>"))
+            foreach (BinaryData item in client.GetQnas("<projectName>", source: "<source>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("answer").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("questions")[0].ToString());
-                Console.WriteLine(result.GetProperty("metadata").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("isContextOnly").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("answer").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("questions")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("metadata").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("isContextOnly").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
             }
         }
 
@@ -1082,14 +1080,14 @@ public void Example_GetQnas_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetQnas_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetQnasAsync("<projectName>"))
+            await foreach (BinaryData item in client.GetQnasAsync("<projectName>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1097,35 +1095,35 @@ public async Task Example_GetQnas_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetQnas_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            await foreach (var item in client.GetQnasAsync("<projectName>", "<source>"))
+            await foreach (BinaryData item in client.GetQnasAsync("<projectName>", source: "<source>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("answer").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("questions")[0].ToString());
-                Console.WriteLine(result.GetProperty("metadata").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("isContextOnly").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("answer").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("questions")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("metadata").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("isContextOnly").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
             }
         }
 
@@ -1133,65 +1131,57 @@ public async Task Example_GetQnas_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteProject()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var operation = client.DeleteProject(WaitUntil.Completed, "<projectName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.DeleteProject(WaitUntil.Completed, "<projectName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteProject_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var operation = client.DeleteProject(WaitUntil.Completed, "<projectName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.DeleteProject(WaitUntil.Completed, "<projectName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteProject_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var operation = await client.DeleteProjectAsync(WaitUntil.Completed, "<projectName>");
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.DeleteProjectAsync(WaitUntil.Completed, "<projectName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteProject_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var operation = await client.DeleteProjectAsync(WaitUntil.Completed, "<projectName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.DeleteProjectAsync(WaitUntil.Completed, "<projectName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_Export()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var operation = client.Export(WaitUntil.Completed, "<projectName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.Export(WaitUntil.Completed, "<projectName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("jobId").ToString());
@@ -1203,13 +1193,13 @@ public void Example_Export()
         [Ignore("Only validating compilation of examples")]
         public void Example_Export_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var operation = client.Export(WaitUntil.Completed, "<projectName>", "<format>", "<assetKind>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.Export(WaitUntil.Completed, "<projectName>", format: "json", assetKind: "qnas");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
@@ -1222,13 +1212,13 @@ public void Example_Export_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Export_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var operation = await client.ExportAsync(WaitUntil.Completed, "<projectName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.ExportAsync(WaitUntil.Completed, "<projectName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("jobId").ToString());
@@ -1240,13 +1230,13 @@ public async Task Example_Export_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Export_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var operation = await client.ExportAsync(WaitUntil.Completed, "<projectName>", "<format>", "<assetKind>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.ExportAsync(WaitUntil.Completed, "<projectName>", format: "json", assetKind: "qnas");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
@@ -1259,15 +1249,14 @@ public async Task Example_Export_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_Import()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var data = new { };
-
-            var operation = client.Import(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+            RequestContent content = null;
+            Operation<BinaryData> operation = client.Import(WaitUntil.Completed, "<projectName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("jobId").ToString());
@@ -1279,96 +1268,106 @@ public void Example_Import()
         [Ignore("Only validating compilation of examples")]
         public void Example_Import_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                metadata = new
+                ["metadata"] = new Dictionary<string, object>()
                 {
-                    description = "<description>",
-                    language = "<language>",
-                    multilingualResource = true,
-                    settings = new
+                    ["description"] = "<description>",
+                    ["language"] = "<language>",
+                    ["multilingualResource"] = true,
+                    ["settings"] = new Dictionary<string, object>()
                     {
-                        defaultAnswer = "<defaultAnswer>",
+                        ["defaultAnswer"] = "<defaultAnswer>",
                     },
                 },
-                assets = new
+                ["assets"] = new Dictionary<string, object>()
                 {
-                    synonyms = new[] {
-            new {
-                alterations = new[] {
-                    "<String>"
-                },
-            }
-        },
-                    qnas = new[] {
-            new {
-                id = 1234,
-                answer = "<answer>",
-                source = "<source>",
-                questions = new[] {
-                    "<String>"
-                },
-                metadata = new {
-                    key = "<String>",
-                },
-                dialog = new {
-                    isContextOnly = true,
-                    prompts = new[] {
-                        new {
-                            displayOrder = 1234,
-                            qnaId = 1234,
-                            qna = new {
-                                id = 1234,
-                                answer = "<answer>",
-                                source = "<source>",
-                                questions = new[] {
-                                    "<String>"
-                                },
-                                metadata = new {
-                                    key = "<String>",
-                                },
-                                activeLearningSuggestions = new[] {
-                                    new {
-                                        clusterHead = "<clusterHead>",
-                                        suggestedQuestions = new[] {
-                                            new {
-                                                question = "<question>",
-                                                userSuggestedCount = 1234,
-                                                autoSuggestedCount = 1234,
-                                            }
-                                        },
-                                    }
-                                },
-                            },
-                            displayText = "<displayText>",
-                        }
-                    },
-                },
-                activeLearningSuggestions = new[] {
-                    new {
-                        clusterHead = "<clusterHead>",
-                        suggestedQuestions = new[] {
-                            new {
-                                question = "<question>",
-                                userSuggestedCount = 1234,
-                                autoSuggestedCount = 1234,
-                            }
-                        },
-                    }
-                },
-            }
-        },
+                    ["synonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["alterations"] = new List<object>()
+{
+"<alterations>"
+},
+}
+},
+                    ["qnas"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = 1234,
+["answer"] = "<answer>",
+["source"] = "<source>",
+["questions"] = new List<object>()
+{
+"<questions>"
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["key"] = "<metadata>",
+},
+["dialog"] = new Dictionary<string, object>()
+{
+["isContextOnly"] = true,
+["prompts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayOrder"] = 1234,
+["qnaId"] = 1234,
+["qna"] = new Dictionary<string, object>()
+{
+["id"] = 1234,
+["answer"] = "<answer>",
+["source"] = "<source>",
+["questions"] = new List<object>()
+{
+"<questions>"
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["key"] = "<metadata>",
+},
+["dialog"] = null
+,
+["activeLearningSuggestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["clusterHead"] = "<clusterHead>",
+["suggestedQuestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["question"] = "<question>",
+["userSuggestedCount"] = 1234,
+["autoSuggestedCount"] = 1234,
+}
+},
+}
+},
+},
+["displayText"] = "<displayText>",
+}
+},
+},
+["activeLearningSuggestions"] = new List<object>()
+{
+null
+},
+}
+},
                 },
-                fileUri = "<fileUri>",
-            };
-
-            var operation = client.Import(WaitUntil.Completed, "<projectName>", RequestContent.Create(data), "<format>", "<assetKind>");
-
+                ["fileUri"] = "<fileUri>",
+            });
+            Operation<BinaryData> operation = client.Import(WaitUntil.Completed, "<projectName>", content, format: "json", assetKind: "qnas");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
@@ -1381,15 +1380,14 @@ public void Example_Import_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Import_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var data = new { };
-
-            var operation = await client.ImportAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+            RequestContent content = null;
+            Operation<BinaryData> operation = await client.ImportAsync(WaitUntil.Completed, "<projectName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("jobId").ToString());
@@ -1401,96 +1399,106 @@ public async Task Example_Import_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Import_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                metadata = new
+                ["metadata"] = new Dictionary<string, object>()
                 {
-                    description = "<description>",
-                    language = "<language>",
-                    multilingualResource = true,
-                    settings = new
+                    ["description"] = "<description>",
+                    ["language"] = "<language>",
+                    ["multilingualResource"] = true,
+                    ["settings"] = new Dictionary<string, object>()
                     {
-                        defaultAnswer = "<defaultAnswer>",
+                        ["defaultAnswer"] = "<defaultAnswer>",
                     },
                 },
-                assets = new
+                ["assets"] = new Dictionary<string, object>()
                 {
-                    synonyms = new[] {
-            new {
-                alterations = new[] {
-                    "<String>"
-                },
-            }
-        },
-                    qnas = new[] {
-            new {
-                id = 1234,
-                answer = "<answer>",
-                source = "<source>",
-                questions = new[] {
-                    "<String>"
-                },
-                metadata = new {
-                    key = "<String>",
-                },
-                dialog = new {
-                    isContextOnly = true,
-                    prompts = new[] {
-                        new {
-                            displayOrder = 1234,
-                            qnaId = 1234,
-                            qna = new {
-                                id = 1234,
-                                answer = "<answer>",
-                                source = "<source>",
-                                questions = new[] {
-                                    "<String>"
-                                },
-                                metadata = new {
-                                    key = "<String>",
-                                },
-                                activeLearningSuggestions = new[] {
-                                    new {
-                                        clusterHead = "<clusterHead>",
-                                        suggestedQuestions = new[] {
-                                            new {
-                                                question = "<question>",
-                                                userSuggestedCount = 1234,
-                                                autoSuggestedCount = 1234,
-                                            }
-                                        },
-                                    }
-                                },
-                            },
-                            displayText = "<displayText>",
-                        }
-                    },
-                },
-                activeLearningSuggestions = new[] {
-                    new {
-                        clusterHead = "<clusterHead>",
-                        suggestedQuestions = new[] {
-                            new {
-                                question = "<question>",
-                                userSuggestedCount = 1234,
-                                autoSuggestedCount = 1234,
-                            }
-                        },
-                    }
-                },
-            }
-        },
+                    ["synonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["alterations"] = new List<object>()
+{
+"<alterations>"
+},
+}
+},
+                    ["qnas"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = 1234,
+["answer"] = "<answer>",
+["source"] = "<source>",
+["questions"] = new List<object>()
+{
+"<questions>"
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["key"] = "<metadata>",
+},
+["dialog"] = new Dictionary<string, object>()
+{
+["isContextOnly"] = true,
+["prompts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayOrder"] = 1234,
+["qnaId"] = 1234,
+["qna"] = new Dictionary<string, object>()
+{
+["id"] = 1234,
+["answer"] = "<answer>",
+["source"] = "<source>",
+["questions"] = new List<object>()
+{
+"<questions>"
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["key"] = "<metadata>",
+},
+["dialog"] = null
+,
+["activeLearningSuggestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["clusterHead"] = "<clusterHead>",
+["suggestedQuestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["question"] = "<question>",
+["userSuggestedCount"] = 1234,
+["autoSuggestedCount"] = 1234,
+}
+},
+}
+},
+},
+["displayText"] = "<displayText>",
+}
+},
+},
+["activeLearningSuggestions"] = new List<object>()
+{
+null
+},
+}
+},
                 },
-                fileUri = "<fileUri>",
-            };
-
-            var operation = await client.ImportAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data), "<format>", "<assetKind>");
-
+                ["fileUri"] = "<fileUri>",
+            });
+            Operation<BinaryData> operation = await client.ImportAsync(WaitUntil.Completed, "<projectName>", content, format: "json", assetKind: "qnas");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
@@ -1503,13 +1511,13 @@ public async Task Example_Import_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeployProject()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var operation = client.DeployProject(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.DeployProject(WaitUntil.Completed, "<projectName>", "<deploymentName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.ToString());
         }
@@ -1518,13 +1526,13 @@ public void Example_DeployProject()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeployProject_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var operation = client.DeployProject(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.DeployProject(WaitUntil.Completed, "<projectName>", "<deploymentName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("deploymentName").ToString());
             Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
@@ -1534,13 +1542,13 @@ public void Example_DeployProject_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeployProject_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var operation = await client.DeployProjectAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.DeployProjectAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.ToString());
         }
@@ -1549,13 +1557,13 @@ public async Task Example_DeployProject_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeployProject_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var operation = await client.DeployProjectAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>");
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.DeployProjectAsync(WaitUntil.Completed, "<projectName>", "<deploymentName>");
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("deploymentName").ToString());
             Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString());
@@ -1565,27 +1573,28 @@ public async Task Example_DeployProject_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateSources()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var data = new[] {
-    new {
-        op = "add",
-        value = new {
-            sourceUri = "http://localhost:3000",
-            sourceKind = "file",
-        },
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var operation = client.UpdateSources(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
-
-            foreach (var item in operation.Value)
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>()
+{
+["sourceUri"] = "http://localhost:3000",
+["sourceKind"] = "file",
+},
+}
+});
+            Operation<Pageable<BinaryData>> operation = client.UpdateSources(WaitUntil.Completed, "<projectName>", content);
+            foreach (BinaryData item in operation.Value)
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("sourceUri").ToString());
-                Console.WriteLine(result.GetProperty("sourceKind").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
             }
         }
 
@@ -1593,33 +1602,34 @@ public void Example_UpdateSources()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateSources_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var data = new[] {
-    new {
-        op = "add",
-        value = new {
-            displayName = "<displayName>",
-            source = "<source>",
-            sourceUri = "http://localhost:3000",
-            sourceKind = "file",
-            contentStructureKind = "unstructured",
-        },
-    }
-};
-
-            var operation = client.UpdateSources(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            foreach (var item in operation.Value)
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["source"] = "<source>",
+["sourceUri"] = "http://localhost:3000",
+["sourceKind"] = "file",
+["contentStructureKind"] = "unstructured",
+},
+}
+});
+            Operation<Pageable<BinaryData>> operation = client.UpdateSources(WaitUntil.Completed, "<projectName>", content);
+            foreach (BinaryData item in operation.Value)
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("displayName").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("sourceUri").ToString());
-                Console.WriteLine(result.GetProperty("sourceKind").ToString());
-                Console.WriteLine(result.GetProperty("contentStructureKind").ToString());
+                Console.WriteLine(result[0].GetProperty("displayName").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
+                Console.WriteLine(result[0].GetProperty("contentStructureKind").ToString());
             }
         }
 
@@ -1627,27 +1637,28 @@ public void Example_UpdateSources_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateSources_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var data = new[] {
-    new {
-        op = "add",
-        value = new {
-            sourceUri = "http://localhost:3000",
-            sourceKind = "file",
-        },
-    }
-};
-
-            var operation = await client.UpdateSourcesAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            await foreach (var item in operation.Value)
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>()
+{
+["sourceUri"] = "http://localhost:3000",
+["sourceKind"] = "file",
+},
+}
+});
+            Operation<AsyncPageable<BinaryData>> operation = await client.UpdateSourcesAsync(WaitUntil.Completed, "<projectName>", content);
+            await foreach (BinaryData item in operation.Value)
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("sourceUri").ToString());
-                Console.WriteLine(result.GetProperty("sourceKind").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
             }
         }
 
@@ -1655,33 +1666,34 @@ public async Task Example_UpdateSources_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateSources_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var data = new[] {
-    new {
-        op = "add",
-        value = new {
-            displayName = "<displayName>",
-            source = "<source>",
-            sourceUri = "http://localhost:3000",
-            sourceKind = "file",
-            contentStructureKind = "unstructured",
-        },
-    }
-};
-
-            var operation = await client.UpdateSourcesAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            await foreach (var item in operation.Value)
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["source"] = "<source>",
+["sourceUri"] = "http://localhost:3000",
+["sourceKind"] = "file",
+["contentStructureKind"] = "unstructured",
+},
+}
+});
+            Operation<AsyncPageable<BinaryData>> operation = await client.UpdateSourcesAsync(WaitUntil.Completed, "<projectName>", content);
+            await foreach (BinaryData item in operation.Value)
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("displayName").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("sourceUri").ToString());
-                Console.WriteLine(result.GetProperty("sourceKind").ToString());
-                Console.WriteLine(result.GetProperty("contentStructureKind").ToString());
+                Console.WriteLine(result[0].GetProperty("displayName").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceUri").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceKind").ToString());
+                Console.WriteLine(result[0].GetProperty("contentStructureKind").ToString());
             }
         }
 
@@ -1689,23 +1701,23 @@ public async Task Example_UpdateSources_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateQnas()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var data = new[] {
-    new {
-        op = "add",
-        value = new {},
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var operation = client.UpdateQnas(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
-
-            foreach (var item in operation.Value)
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>(),
+}
+});
+            Operation<Pageable<BinaryData>> operation = client.UpdateQnas(WaitUntil.Completed, "<projectName>", content);
+            foreach (BinaryData item in operation.Value)
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1713,76 +1725,88 @@ public void Example_UpdateQnas()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateQnas_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var data = new[] {
-    new {
-        op = "add",
-        value = new {
-            id = 1234,
-            answer = "<answer>",
-            source = "<source>",
-            questions = new[] {
-                "<String>"
-            },
-            metadata = new {
-                key = "<String>",
-            },
-            dialog = new {
-                isContextOnly = true,
-                prompts = new[] {
-                    new {
-                        displayOrder = 1234,
-                        qnaId = 1234,
-                        displayText = "<displayText>",
-                    }
-                },
-            },
-            activeLearningSuggestions = new[] {
-                new {
-                    clusterHead = "<clusterHead>",
-                    suggestedQuestions = new[] {
-                        new {
-                            question = "<question>",
-                            userSuggestedCount = 1234,
-                            autoSuggestedCount = 1234,
-                        }
-                    },
-                }
-            },
-        },
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            var operation = client.UpdateQnas(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
-
-            foreach (var item in operation.Value)
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>()
+{
+["id"] = 1234,
+["answer"] = "<answer>",
+["source"] = "<source>",
+["questions"] = new List<object>()
+{
+"<questions>"
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["key"] = "<metadata>",
+},
+["dialog"] = new Dictionary<string, object>()
+{
+["isContextOnly"] = true,
+["prompts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayOrder"] = 1234,
+["qnaId"] = 1234,
+["qna"] = null
+,
+["displayText"] = "<displayText>",
+}
+},
+},
+["activeLearningSuggestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["clusterHead"] = "<clusterHead>",
+["suggestedQuestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["question"] = "<question>",
+["userSuggestedCount"] = 1234,
+["autoSuggestedCount"] = 1234,
+}
+},
+}
+},
+},
+}
+});
+            Operation<Pageable<BinaryData>> operation = client.UpdateQnas(WaitUntil.Completed, "<projectName>", content);
+            foreach (BinaryData item in operation.Value)
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("answer").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("questions")[0].ToString());
-                Console.WriteLine(result.GetProperty("metadata").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("isContextOnly").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("answer").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("questions")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("metadata").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("isContextOnly").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
             }
         }
 
@@ -1790,23 +1814,23 @@ public void Example_UpdateQnas_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateQnas_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var data = new[] {
-    new {
-        op = "add",
-        value = new {},
-    }
-};
-
-            var operation = await client.UpdateQnasAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            await foreach (var item in operation.Value)
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>(),
+}
+});
+            Operation<AsyncPageable<BinaryData>> operation = await client.UpdateQnasAsync(WaitUntil.Completed, "<projectName>", content);
+            await foreach (BinaryData item in operation.Value)
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1814,76 +1838,88 @@ public async Task Example_UpdateQnas_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateQnas_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new QuestionAnsweringAuthoringClient(endpoint, credential);
-
-            var data = new[] {
-    new {
-        op = "add",
-        value = new {
-            id = 1234,
-            answer = "<answer>",
-            source = "<source>",
-            questions = new[] {
-                "<String>"
-            },
-            metadata = new {
-                key = "<String>",
-            },
-            dialog = new {
-                isContextOnly = true,
-                prompts = new[] {
-                    new {
-                        displayOrder = 1234,
-                        qnaId = 1234,
-                        displayText = "<displayText>",
-                    }
-                },
-            },
-            activeLearningSuggestions = new[] {
-                new {
-                    clusterHead = "<clusterHead>",
-                    suggestedQuestions = new[] {
-                        new {
-                            question = "<question>",
-                            userSuggestedCount = 1234,
-                            autoSuggestedCount = 1234,
-                        }
-                    },
-                }
-            },
-        },
-    }
-};
-
-            var operation = await client.UpdateQnasAsync(WaitUntil.Completed, "<projectName>", RequestContent.Create(data));
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            QuestionAnsweringAuthoringClient client = new QuestionAnsweringAuthoringClient(endpoint, credential);
 
-            await foreach (var item in operation.Value)
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["op"] = "add",
+["value"] = new Dictionary<string, object>()
+{
+["id"] = 1234,
+["answer"] = "<answer>",
+["source"] = "<source>",
+["questions"] = new List<object>()
+{
+"<questions>"
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["key"] = "<metadata>",
+},
+["dialog"] = new Dictionary<string, object>()
+{
+["isContextOnly"] = true,
+["prompts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayOrder"] = 1234,
+["qnaId"] = 1234,
+["qna"] = null
+,
+["displayText"] = "<displayText>",
+}
+},
+},
+["activeLearningSuggestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["clusterHead"] = "<clusterHead>",
+["suggestedQuestions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["question"] = "<question>",
+["userSuggestedCount"] = 1234,
+["autoSuggestedCount"] = 1234,
+}
+},
+}
+},
+},
+}
+});
+            Operation<AsyncPageable<BinaryData>> operation = await client.UpdateQnasAsync(WaitUntil.Completed, "<projectName>", content);
+            await foreach (BinaryData item in operation.Value)
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("answer").ToString());
-                Console.WriteLine(result.GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("questions")[0].ToString());
-                Console.WriteLine(result.GetProperty("metadata").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("isContextOnly").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
-                Console.WriteLine(result.GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
-                Console.WriteLine(result.GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("answer").ToString());
+                Console.WriteLine(result[0].GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("questions")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("metadata").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("isContextOnly").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayOrder").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qnaId").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("answer").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("source").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("questions")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("metadata").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("qna").GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("dialog").GetProperty("prompts")[0].GetProperty("displayText").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("clusterHead").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("question").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("userSuggestedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("activeLearningSuggestions")[0].GetProperty("suggestedQuestions")[0].GetProperty("autoSuggestedCount").ToString());
             }
         }
     }
diff --git a/sdk/confidentialledger/Azure.Security.ConfidentialLedger/src/Generated/Docs/ConfidentialLedgerCertificateClient.xml b/sdk/confidentialledger/Azure.Security.ConfidentialLedger/src/Generated/Docs/ConfidentialLedgerCertificateClient.xml
index 7dd538153711..e9aadce888c0 100644
--- a/sdk/confidentialledger/Azure.Security.ConfidentialLedger/src/Generated/Docs/ConfidentialLedgerCertificateClient.xml
+++ b/sdk/confidentialledger/Azure.Security.ConfidentialLedger/src/Generated/Docs/ConfidentialLedgerCertificateClient.xml
@@ -2,34 +2,48 @@
 <doc>
   <members>
     <member name="GetLedgerIdentityAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetLedgerIdentityAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLedgerIdentityAsync and parse the result.
 <code><![CDATA[
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerCertificateClient(endpoint);
+ConfidentialLedgerCertificateClient client = new ConfidentialLedgerCertificateClient(new Uri("http://localhost:3000"));
 
 Response response = await client.GetLedgerIdentityAsync("<ledgerId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("ledgerId").ToString());
 Console.WriteLine(result.GetProperty("ledgerTlsCertificate").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetLedgerIdentityAsync with all parameters and parse the result.
+<code><![CDATA[
+ConfidentialLedgerCertificateClient client = new ConfidentialLedgerCertificateClient(new Uri("http://localhost:3000"));
+
+Response response = await client.GetLedgerIdentityAsync("<ledgerId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("ledgerId").ToString());
+Console.WriteLine(result.GetProperty("ledgerTlsCertificate").ToString());
+]]></code></example>
     </member>
     <member name="GetLedgerIdentity(string,RequestContext)">
-<example>
-This sample shows how to call GetLedgerIdentity with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLedgerIdentity and parse the result.
 <code><![CDATA[
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerCertificateClient(endpoint);
+ConfidentialLedgerCertificateClient client = new ConfidentialLedgerCertificateClient(new Uri("http://localhost:3000"));
 
 Response response = client.GetLedgerIdentity("<ledgerId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("ledgerId").ToString());
 Console.WriteLine(result.GetProperty("ledgerTlsCertificate").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetLedgerIdentity with all parameters and parse the result.
+<code><![CDATA[
+ConfidentialLedgerCertificateClient client = new ConfidentialLedgerCertificateClient(new Uri("http://localhost:3000"));
+
+Response response = client.GetLedgerIdentity("<ledgerId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("ledgerId").ToString());
+Console.WriteLine(result.GetProperty("ledgerTlsCertificate").ToString());
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/confidentialledger/Azure.Security.ConfidentialLedger/src/Generated/Docs/ConfidentialLedgerClient.xml b/sdk/confidentialledger/Azure.Security.ConfidentialLedger/src/Generated/Docs/ConfidentialLedgerClient.xml
index de858ef56293..905aba46d498 100644
--- a/sdk/confidentialledger/Azure.Security.ConfidentialLedger/src/Generated/Docs/ConfidentialLedgerClient.xml
+++ b/sdk/confidentialledger/Azure.Security.ConfidentialLedger/src/Generated/Docs/ConfidentialLedgerClient.xml
@@ -2,12 +2,11 @@
 <doc>
   <members>
     <member name="GetConstitutionAsync(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetConstitutionAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = await client.GetConstitutionAsync();
 
@@ -15,15 +14,24 @@ JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("digest").ToString());
 Console.WriteLine(result.GetProperty("script").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetConstitutionAsync with all request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+Response response = await client.GetConstitutionAsync();
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("digest").ToString());
+Console.WriteLine(result.GetProperty("script").ToString());
+]]></code></example>
     </member>
     <member name="GetConstitution(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetConstitution and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = client.GetConstitution();
 
@@ -31,179 +39,209 @@ JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("digest").ToString());
 Console.WriteLine(result.GetProperty("script").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetConstitution with all request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+Response response = client.GetConstitution();
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("digest").ToString());
+Console.WriteLine(result.GetProperty("script").ToString());
+]]></code></example>
     </member>
     <member name="GetEnclaveQuotesAsync(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetEnclaveQuotesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = await client.GetEnclaveQuotesAsync();
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("currentNodeId").ToString());
-Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("nodeId").ToString());
-Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("mrenclave").ToString());
-Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("quoteVersion").ToString());
-Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("raw").ToString());
+Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("nodeId").ToString());
+Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("quoteVersion").ToString());
+Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("raw").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetEnclaveQuotesAsync with all request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+Response response = await client.GetEnclaveQuotesAsync();
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("currentNodeId").ToString());
+Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("nodeId").ToString());
+Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("mrenclave").ToString());
+Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("quoteVersion").ToString());
+Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("raw").ToString());
+]]></code></example>
     </member>
     <member name="GetEnclaveQuotes(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetEnclaveQuotes and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = client.GetEnclaveQuotes();
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("currentNodeId").ToString());
-Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("nodeId").ToString());
-Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("mrenclave").ToString());
-Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("quoteVersion").ToString());
-Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("raw").ToString());
+Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("nodeId").ToString());
+Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("quoteVersion").ToString());
+Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("raw").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetEnclaveQuotes with all request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+Response response = client.GetEnclaveQuotes();
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("currentNodeId").ToString());
+Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("nodeId").ToString());
+Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("mrenclave").ToString());
+Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("quoteVersion").ToString());
+Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("raw").ToString());
+]]></code></example>
     </member>
     <member name="CreateLedgerEntryAsync(RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call CreateLedgerEntryAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateLedgerEntryAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-var data = new {
-    contents = "<contents>",
-};
-
-Response response = await client.CreateLedgerEntryAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["contents"] = "<contents>",
+});
+Response response = await client.CreateLedgerEntryAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("collectionId").ToString());
 ]]></code>
-This sample shows how to call CreateLedgerEntryAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateLedgerEntryAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-var data = new {
-    contents = "<contents>",
-};
-
-Response response = await client.CreateLedgerEntryAsync(RequestContent.Create(data), "<collectionId>");
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["contents"] = "<contents>",
+});
+Response response = await client.CreateLedgerEntryAsync(content, collectionId: "<collectionId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("collectionId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateLedgerEntry(RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call CreateLedgerEntry with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateLedgerEntry and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
-
-var data = new {
-    contents = "<contents>",
-};
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-Response response = client.CreateLedgerEntry(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["contents"] = "<contents>",
+});
+Response response = client.CreateLedgerEntry(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("collectionId").ToString());
 ]]></code>
-This sample shows how to call CreateLedgerEntry with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateLedgerEntry with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
-
-var data = new {
-    contents = "<contents>",
-};
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-Response response = client.CreateLedgerEntry(RequestContent.Create(data), "<collectionId>");
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["contents"] = "<contents>",
+});
+Response response = client.CreateLedgerEntry(content, collectionId: "<collectionId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("collectionId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetLedgerEntryAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetLedgerEntryAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLedgerEntryAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = await client.GetLedgerEntryAsync("<transactionId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("state").ToString());
 ]]></code>
-This sample shows how to call GetLedgerEntryAsync with all parameters, and how to parse the result.
+This sample shows how to call GetLedgerEntryAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-Response response = await client.GetLedgerEntryAsync("<transactionId>", "<collectionId>");
+Response response = await client.GetLedgerEntryAsync("<transactionId>", collectionId: "<collectionId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("state").ToString());
 Console.WriteLine(result.GetProperty("entry").GetProperty("contents").ToString());
 Console.WriteLine(result.GetProperty("entry").GetProperty("collectionId").ToString());
 Console.WriteLine(result.GetProperty("entry").GetProperty("transactionId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetLedgerEntry(string,string,RequestContext)">
-<example>
-This sample shows how to call GetLedgerEntry with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLedgerEntry and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = client.GetLedgerEntry("<transactionId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("state").ToString());
 ]]></code>
-This sample shows how to call GetLedgerEntry with all parameters, and how to parse the result.
+This sample shows how to call GetLedgerEntry with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-Response response = client.GetLedgerEntry("<transactionId>", "<collectionId>");
+Response response = client.GetLedgerEntry("<transactionId>", collectionId: "<collectionId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("state").ToString());
 Console.WriteLine(result.GetProperty("entry").GetProperty("contents").ToString());
 Console.WriteLine(result.GetProperty("entry").GetProperty("collectionId").ToString());
 Console.WriteLine(result.GetProperty("entry").GetProperty("transactionId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetReceiptAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetReceiptAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetReceiptAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+Response response = await client.GetReceiptAsync("<transactionId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("state").ToString());
+Console.WriteLine(result.GetProperty("transactionId").ToString());
+]]></code>
+This sample shows how to call GetReceiptAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = await client.GetReceiptAsync("<transactionId>");
 
@@ -221,16 +259,25 @@ Console.WriteLine(result.GetProperty("receipt").GetProperty("serviceEndorsements
 Console.WriteLine(result.GetProperty("receipt").GetProperty("signature").ToString());
 Console.WriteLine(result.GetProperty("state").ToString());
 Console.WriteLine(result.GetProperty("transactionId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetReceipt(string,RequestContext)">
-<example>
-This sample shows how to call GetReceipt with required parameters and parse the result.
+      <example>
+This sample shows how to call GetReceipt and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+Response response = client.GetReceipt("<transactionId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("state").ToString());
+Console.WriteLine(result.GetProperty("transactionId").ToString());
+]]></code>
+This sample shows how to call GetReceipt with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = client.GetReceipt("<transactionId>");
 
@@ -248,16 +295,14 @@ Console.WriteLine(result.GetProperty("receipt").GetProperty("serviceEndorsements
 Console.WriteLine(result.GetProperty("receipt").GetProperty("signature").ToString());
 Console.WriteLine(result.GetProperty("state").ToString());
 Console.WriteLine(result.GetProperty("transactionId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTransactionStatusAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetTransactionStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTransactionStatusAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = await client.GetTransactionStatusAsync("<transactionId>");
 
@@ -265,15 +310,24 @@ JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("state").ToString());
 Console.WriteLine(result.GetProperty("transactionId").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetTransactionStatusAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+Response response = await client.GetTransactionStatusAsync("<transactionId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("state").ToString());
+Console.WriteLine(result.GetProperty("transactionId").ToString());
+]]></code></example>
     </member>
     <member name="GetTransactionStatus(string,RequestContext)">
-<example>
-This sample shows how to call GetTransactionStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTransactionStatus and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = client.GetTransactionStatus("<transactionId>");
 
@@ -281,287 +335,375 @@ JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("state").ToString());
 Console.WriteLine(result.GetProperty("transactionId").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetTransactionStatus with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+Response response = client.GetTransactionStatus("<transactionId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("state").ToString());
+Console.WriteLine(result.GetProperty("transactionId").ToString());
+]]></code></example>
     </member>
     <member name="GetCurrentLedgerEntryAsync(string,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetCurrentLedgerEntryAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = await client.GetCurrentLedgerEntryAsync();
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("contents").ToString());
 ]]></code>
-This sample shows how to call GetCurrentLedgerEntryAsync with all parameters, and how to parse the result.
+This sample shows how to call GetCurrentLedgerEntryAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-Response response = await client.GetCurrentLedgerEntryAsync("<collectionId>");
+Response response = await client.GetCurrentLedgerEntryAsync(collectionId: "<collectionId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("contents").ToString());
 Console.WriteLine(result.GetProperty("collectionId").ToString());
 Console.WriteLine(result.GetProperty("transactionId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCurrentLedgerEntry(string,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetCurrentLedgerEntry and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = client.GetCurrentLedgerEntry();
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("contents").ToString());
 ]]></code>
-This sample shows how to call GetCurrentLedgerEntry with all parameters, and how to parse the result.
+This sample shows how to call GetCurrentLedgerEntry with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-Response response = client.GetCurrentLedgerEntry("<collectionId>");
+Response response = client.GetCurrentLedgerEntry(collectionId: "<collectionId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("contents").ToString());
 Console.WriteLine(result.GetProperty("collectionId").ToString());
 Console.WriteLine(result.GetProperty("transactionId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteUserAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteUserAsync with required parameters.
+      <example>
+This sample shows how to call DeleteUserAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = await client.DeleteUserAsync("<userId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteUserAsync with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+Response response = await client.DeleteUserAsync("<userId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteUser(string,RequestContext)">
-<example>
-This sample shows how to call DeleteUser with required parameters.
+      <example>
+This sample shows how to call DeleteUser.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = client.DeleteUser("<userId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteUser with all parameters.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+Response response = client.DeleteUser("<userId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetUserAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetUserAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetUserAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = await client.GetUserAsync("<userId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("assignedRole").ToString());
-Console.WriteLine(result.GetProperty("userId").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetUserAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+Response response = await client.GetUserAsync("<userId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("assignedRole").ToString());
+Console.WriteLine(result.GetProperty("userId").ToString());
+]]></code></example>
     </member>
     <member name="GetUser(string,RequestContext)">
-<example>
-This sample shows how to call GetUser with required parameters and parse the result.
+      <example>
+This sample shows how to call GetUser and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
 Response response = client.GetUser("<userId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("assignedRole").ToString());
-Console.WriteLine(result.GetProperty("userId").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetUser with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+Response response = client.GetUser("<userId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("assignedRole").ToString());
+Console.WriteLine(result.GetProperty("userId").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateUserAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateUserAsync with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateUserAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-var data = new {
-    assignedRole = "Administrator",
-};
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["assignedRole"] = "Administrator",
+});
+Response response = await client.CreateOrUpdateUserAsync("<userId>", content);
 
-Response response = await client.CreateOrUpdateUserAsync("<userId>", RequestContent.Create(data));
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("assignedRole").ToString());
+]]></code>
+This sample shows how to call CreateOrUpdateUserAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["assignedRole"] = "Administrator",
+});
+Response response = await client.CreateOrUpdateUserAsync("<userId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("assignedRole").ToString());
 Console.WriteLine(result.GetProperty("userId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateUser(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateUser with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateUser and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-var data = new {
-    assignedRole = "Administrator",
-};
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["assignedRole"] = "Administrator",
+});
+Response response = client.CreateOrUpdateUser("<userId>", content);
 
-Response response = client.CreateOrUpdateUser("<userId>", RequestContent.Create(data));
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("assignedRole").ToString());
+]]></code>
+This sample shows how to call CreateOrUpdateUser with all parameters and request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["assignedRole"] = "Administrator",
+});
+Response response = client.CreateOrUpdateUser("<userId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("assignedRole").ToString());
 Console.WriteLine(result.GetProperty("userId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetConsortiumMembersAsync(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetConsortiumMembersAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-await foreach (var item in client.GetConsortiumMembersAsync())
+await foreach (BinaryData item in client.GetConsortiumMembersAsync())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("certificate").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("certificate").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetConsortiumMembersAsync with all request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+await foreach (BinaryData item in client.GetConsortiumMembersAsync())
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("certificate").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetConsortiumMembers(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetConsortiumMembers and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-foreach (var item in client.GetConsortiumMembers())
+foreach (BinaryData item in client.GetConsortiumMembers())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("certificate").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("certificate").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetConsortiumMembers with all request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+foreach (BinaryData item in client.GetConsortiumMembers())
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("certificate").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetCollectionsAsync(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetCollectionsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-await foreach (var item in client.GetCollectionsAsync())
+await foreach (BinaryData item in client.GetCollectionsAsync())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("collectionId").ToString());
+    Console.WriteLine(result[0].GetProperty("collectionId").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetCollectionsAsync with all request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+await foreach (BinaryData item in client.GetCollectionsAsync())
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("collectionId").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetCollections(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetCollections and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-foreach (var item in client.GetCollections())
+foreach (BinaryData item in client.GetCollections())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("collectionId").ToString());
+    Console.WriteLine(result[0].GetProperty("collectionId").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetCollections with all request content and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
+
+foreach (BinaryData item in client.GetCollections())
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("collectionId").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetLedgerEntriesAsync(string,string,string,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetLedgerEntriesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-await foreach (var item in client.GetLedgerEntriesAsync())
+await foreach (BinaryData item in client.GetLedgerEntriesAsync())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("contents").ToString());
+    Console.WriteLine(result[0].GetProperty("contents").ToString());
 }
 ]]></code>
-This sample shows how to call GetLedgerEntriesAsync with all parameters, and how to parse the result.
+This sample shows how to call GetLedgerEntriesAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-await foreach (var item in client.GetLedgerEntriesAsync("<collectionId>", "<fromTransactionId>", "<toTransactionId>"))
+await foreach (BinaryData item in client.GetLedgerEntriesAsync(collectionId: "<collectionId>", fromTransactionId: "<fromTransactionId>", toTransactionId: "<toTransactionId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("contents").ToString());
-    Console.WriteLine(result.GetProperty("collectionId").ToString());
-    Console.WriteLine(result.GetProperty("transactionId").ToString());
+    Console.WriteLine(result[0].GetProperty("contents").ToString());
+    Console.WriteLine(result[0].GetProperty("collectionId").ToString());
+    Console.WriteLine(result[0].GetProperty("transactionId").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetLedgerEntries(string,string,string,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetLedgerEntries and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-foreach (var item in client.GetLedgerEntries())
+foreach (BinaryData item in client.GetLedgerEntries())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("contents").ToString());
+    Console.WriteLine(result[0].GetProperty("contents").ToString());
 }
 ]]></code>
-This sample shows how to call GetLedgerEntries with all parameters, and how to parse the result.
+This sample shows how to call GetLedgerEntries with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ConfidentialLedgerClient(endpoint, credential);
+TokenCredential credential = new DefaultAzureCredential();
+ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-foreach (var item in client.GetLedgerEntries("<collectionId>", "<fromTransactionId>", "<toTransactionId>"))
+foreach (BinaryData item in client.GetLedgerEntries(collectionId: "<collectionId>", fromTransactionId: "<fromTransactionId>", toTransactionId: "<toTransactionId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("contents").ToString());
-    Console.WriteLine(result.GetProperty("collectionId").ToString());
-    Console.WriteLine(result.GetProperty("transactionId").ToString());
+    Console.WriteLine(result[0].GetProperty("contents").ToString());
+    Console.WriteLine(result[0].GetProperty("collectionId").ToString());
+    Console.WriteLine(result[0].GetProperty("transactionId").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/confidentialledger/Azure.Security.ConfidentialLedger/tests/Generated/Samples/Samples_ConfidentialLedgerCertificateClient.cs b/sdk/confidentialledger/Azure.Security.ConfidentialLedger/tests/Generated/Samples/Samples_ConfidentialLedgerCertificateClient.cs
index 48ed727a39d9..a249a40010f2 100644
--- a/sdk/confidentialledger/Azure.Security.ConfidentialLedger/tests/Generated/Samples/Samples_ConfidentialLedgerCertificateClient.cs
+++ b/sdk/confidentialledger/Azure.Security.ConfidentialLedger/tests/Generated/Samples/Samples_ConfidentialLedgerCertificateClient.cs
@@ -6,13 +6,11 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
-using Azure.Core;
 using Azure.Identity;
+using Azure.Security.ConfidentialLedger.Certificate;
 using NUnit.Framework;
 
 namespace Azure.Security.ConfidentialLedger.Certificate.Samples
@@ -23,8 +21,7 @@ public class Samples_ConfidentialLedgerCertificateClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLedgerIdentity()
         {
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerCertificateClient(endpoint);
+            ConfidentialLedgerCertificateClient client = new ConfidentialLedgerCertificateClient(new Uri("http://localhost:3000"));
 
             Response response = client.GetLedgerIdentity("<ledgerId>");
 
@@ -36,8 +33,7 @@ public void Example_GetLedgerIdentity()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLedgerIdentity_AllParameters()
         {
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerCertificateClient(endpoint);
+            ConfidentialLedgerCertificateClient client = new ConfidentialLedgerCertificateClient(new Uri("http://localhost:3000"));
 
             Response response = client.GetLedgerIdentity("<ledgerId>");
 
@@ -50,8 +46,7 @@ public void Example_GetLedgerIdentity_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLedgerIdentity_Async()
         {
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerCertificateClient(endpoint);
+            ConfidentialLedgerCertificateClient client = new ConfidentialLedgerCertificateClient(new Uri("http://localhost:3000"));
 
             Response response = await client.GetLedgerIdentityAsync("<ledgerId>");
 
@@ -63,8 +58,7 @@ public async Task Example_GetLedgerIdentity_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLedgerIdentity_AllParameters_Async()
         {
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerCertificateClient(endpoint);
+            ConfidentialLedgerCertificateClient client = new ConfidentialLedgerCertificateClient(new Uri("http://localhost:3000"));
 
             Response response = await client.GetLedgerIdentityAsync("<ledgerId>");
 
diff --git a/sdk/confidentialledger/Azure.Security.ConfidentialLedger/tests/Generated/Samples/Samples_ConfidentialLedgerClient.cs b/sdk/confidentialledger/Azure.Security.ConfidentialLedger/tests/Generated/Samples/Samples_ConfidentialLedgerClient.cs
index 87932464075a..37051e1f62cc 100644
--- a/sdk/confidentialledger/Azure.Security.ConfidentialLedger/tests/Generated/Samples/Samples_ConfidentialLedgerClient.cs
+++ b/sdk/confidentialledger/Azure.Security.ConfidentialLedger/tests/Generated/Samples/Samples_ConfidentialLedgerClient.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Security.ConfidentialLedger;
 using NUnit.Framework;
 
 namespace Azure.Security.ConfidentialLedger.Samples
@@ -23,9 +23,8 @@ public class Samples_ConfidentialLedgerClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetConstitution()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = client.GetConstitution();
 
@@ -38,9 +37,8 @@ public void Example_GetConstitution()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetConstitution_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = client.GetConstitution();
 
@@ -53,9 +51,8 @@ public void Example_GetConstitution_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetConstitution_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = await client.GetConstitutionAsync();
 
@@ -68,9 +65,8 @@ public async Task Example_GetConstitution_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetConstitution_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = await client.GetConstitutionAsync();
 
@@ -83,86 +79,80 @@ public async Task Example_GetConstitution_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEnclaveQuotes()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = client.GetEnclaveQuotes();
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("currentNodeId").ToString());
-            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("nodeId").ToString());
-            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("quoteVersion").ToString());
-            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("raw").ToString());
+            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("nodeId").ToString());
+            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("quoteVersion").ToString());
+            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("raw").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEnclaveQuotes_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = client.GetEnclaveQuotes();
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("currentNodeId").ToString());
-            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("nodeId").ToString());
-            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("mrenclave").ToString());
-            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("quoteVersion").ToString());
-            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("raw").ToString());
+            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("nodeId").ToString());
+            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("mrenclave").ToString());
+            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("quoteVersion").ToString());
+            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("raw").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEnclaveQuotes_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = await client.GetEnclaveQuotesAsync();
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("currentNodeId").ToString());
-            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("nodeId").ToString());
-            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("quoteVersion").ToString());
-            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("raw").ToString());
+            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("nodeId").ToString());
+            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("quoteVersion").ToString());
+            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("raw").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEnclaveQuotes_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = await client.GetEnclaveQuotesAsync();
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("currentNodeId").ToString());
-            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("nodeId").ToString());
-            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("mrenclave").ToString());
-            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("quoteVersion").ToString());
-            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<test>").GetProperty("raw").ToString());
+            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("nodeId").ToString());
+            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("mrenclave").ToString());
+            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("quoteVersion").ToString());
+            Console.WriteLine(result.GetProperty("enclaveQuotes").GetProperty("<key>").GetProperty("raw").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateLedgerEntry()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                contents = "<contents>",
-            };
-
-            Response response = client.CreateLedgerEntry(RequestContent.Create(data));
+                ["contents"] = "<contents>",
+            });
+            Response response = client.CreateLedgerEntry(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("collectionId").ToString());
@@ -172,16 +162,14 @@ public void Example_CreateLedgerEntry()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateLedgerEntry_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                contents = "<contents>",
-            };
-
-            Response response = client.CreateLedgerEntry(RequestContent.Create(data), "<collectionId>");
+                ["contents"] = "<contents>",
+            });
+            Response response = client.CreateLedgerEntry(content, collectionId: "<collectionId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("collectionId").ToString());
@@ -191,16 +179,14 @@ public void Example_CreateLedgerEntry_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateLedgerEntry_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                contents = "<contents>",
-            };
-
-            Response response = await client.CreateLedgerEntryAsync(RequestContent.Create(data));
+                ["contents"] = "<contents>",
+            });
+            Response response = await client.CreateLedgerEntryAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("collectionId").ToString());
@@ -210,16 +196,14 @@ public async Task Example_CreateLedgerEntry_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateLedgerEntry_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                contents = "<contents>",
-            };
-
-            Response response = await client.CreateLedgerEntryAsync(RequestContent.Create(data), "<collectionId>");
+                ["contents"] = "<contents>",
+            });
+            Response response = await client.CreateLedgerEntryAsync(content, collectionId: "<collectionId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("collectionId").ToString());
@@ -229,9 +213,8 @@ public async Task Example_CreateLedgerEntry_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLedgerEntry()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = client.GetLedgerEntry("<transactionId>");
 
@@ -243,11 +226,10 @@ public void Example_GetLedgerEntry()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLedgerEntry_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            Response response = client.GetLedgerEntry("<transactionId>", "<collectionId>");
+            Response response = client.GetLedgerEntry("<transactionId>", collectionId: "<collectionId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("state").ToString());
@@ -260,9 +242,8 @@ public void Example_GetLedgerEntry_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLedgerEntry_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = await client.GetLedgerEntryAsync("<transactionId>");
 
@@ -274,11 +255,10 @@ public async Task Example_GetLedgerEntry_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLedgerEntry_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            Response response = await client.GetLedgerEntryAsync("<transactionId>", "<collectionId>");
+            Response response = await client.GetLedgerEntryAsync("<transactionId>", collectionId: "<collectionId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("state").ToString());
@@ -291,9 +271,8 @@ public async Task Example_GetLedgerEntry_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetReceipt()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = client.GetReceipt("<transactionId>");
 
@@ -306,9 +285,8 @@ public void Example_GetReceipt()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetReceipt_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = client.GetReceipt("<transactionId>");
 
@@ -332,9 +310,8 @@ public void Example_GetReceipt_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetReceipt_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = await client.GetReceiptAsync("<transactionId>");
 
@@ -347,9 +324,8 @@ public async Task Example_GetReceipt_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetReceipt_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = await client.GetReceiptAsync("<transactionId>");
 
@@ -373,9 +349,8 @@ public async Task Example_GetReceipt_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTransactionStatus()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = client.GetTransactionStatus("<transactionId>");
 
@@ -388,9 +363,8 @@ public void Example_GetTransactionStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTransactionStatus_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = client.GetTransactionStatus("<transactionId>");
 
@@ -403,9 +377,8 @@ public void Example_GetTransactionStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTransactionStatus_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = await client.GetTransactionStatusAsync("<transactionId>");
 
@@ -418,9 +391,8 @@ public async Task Example_GetTransactionStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTransactionStatus_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = await client.GetTransactionStatusAsync("<transactionId>");
 
@@ -433,9 +405,8 @@ public async Task Example_GetTransactionStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCurrentLedgerEntry()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = client.GetCurrentLedgerEntry();
 
@@ -447,11 +418,10 @@ public void Example_GetCurrentLedgerEntry()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCurrentLedgerEntry_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            Response response = client.GetCurrentLedgerEntry("<collectionId>");
+            Response response = client.GetCurrentLedgerEntry(collectionId: "<collectionId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("contents").ToString());
@@ -463,9 +433,8 @@ public void Example_GetCurrentLedgerEntry_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCurrentLedgerEntry_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = await client.GetCurrentLedgerEntryAsync();
 
@@ -477,11 +446,10 @@ public async Task Example_GetCurrentLedgerEntry_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCurrentLedgerEntry_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            Response response = await client.GetCurrentLedgerEntryAsync("<collectionId>");
+            Response response = await client.GetCurrentLedgerEntryAsync(collectionId: "<collectionId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("contents").ToString());
@@ -493,9 +461,8 @@ public async Task Example_GetCurrentLedgerEntry_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteUser()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = client.DeleteUser("<userId>");
             Console.WriteLine(response.Status);
@@ -505,9 +472,8 @@ public void Example_DeleteUser()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteUser_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = client.DeleteUser("<userId>");
             Console.WriteLine(response.Status);
@@ -517,9 +483,8 @@ public void Example_DeleteUser_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteUser_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = await client.DeleteUserAsync("<userId>");
             Console.WriteLine(response.Status);
@@ -529,9 +494,8 @@ public async Task Example_DeleteUser_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteUser_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = await client.DeleteUserAsync("<userId>");
             Console.WriteLine(response.Status);
@@ -541,9 +505,8 @@ public async Task Example_DeleteUser_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUser()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = client.GetUser("<userId>");
 
@@ -555,9 +518,8 @@ public void Example_GetUser()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUser_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = client.GetUser("<userId>");
 
@@ -570,9 +532,8 @@ public void Example_GetUser_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUser_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = await client.GetUserAsync("<userId>");
 
@@ -584,9 +545,8 @@ public async Task Example_GetUser_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUser_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
             Response response = await client.GetUserAsync("<userId>");
 
@@ -599,16 +559,14 @@ public async Task Example_GetUser_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateUser()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                assignedRole = "Administrator",
-            };
-
-            Response response = client.CreateOrUpdateUser("<userId>", RequestContent.Create(data));
+                ["assignedRole"] = "Administrator",
+            });
+            Response response = client.CreateOrUpdateUser("<userId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("assignedRole").ToString());
@@ -618,16 +576,14 @@ public void Example_CreateOrUpdateUser()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateUser_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                assignedRole = "Administrator",
-            };
-
-            Response response = client.CreateOrUpdateUser("<userId>", RequestContent.Create(data));
+                ["assignedRole"] = "Administrator",
+            });
+            Response response = client.CreateOrUpdateUser("<userId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("assignedRole").ToString());
@@ -638,16 +594,14 @@ public void Example_CreateOrUpdateUser_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateUser_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                assignedRole = "Administrator",
-            };
-
-            Response response = await client.CreateOrUpdateUserAsync("<userId>", RequestContent.Create(data));
+                ["assignedRole"] = "Administrator",
+            });
+            Response response = await client.CreateOrUpdateUserAsync("<userId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("assignedRole").ToString());
@@ -657,16 +611,14 @@ public async Task Example_CreateOrUpdateUser_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateUser_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                assignedRole = "Administrator",
-            };
-
-            Response response = await client.CreateOrUpdateUserAsync("<userId>", RequestContent.Create(data));
+                ["assignedRole"] = "Administrator",
+            });
+            Response response = await client.CreateOrUpdateUserAsync("<userId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("assignedRole").ToString());
@@ -677,15 +629,14 @@ public async Task Example_CreateOrUpdateUser_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetConsortiumMembers()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            foreach (var item in client.GetConsortiumMembers())
+            foreach (BinaryData item in client.GetConsortiumMembers())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("certificate").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("certificate").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
             }
         }
 
@@ -693,15 +644,14 @@ public void Example_GetConsortiumMembers()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetConsortiumMembers_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            foreach (var item in client.GetConsortiumMembers())
+            foreach (BinaryData item in client.GetConsortiumMembers())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("certificate").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("certificate").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
             }
         }
 
@@ -709,15 +659,14 @@ public void Example_GetConsortiumMembers_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetConsortiumMembers_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            await foreach (var item in client.GetConsortiumMembersAsync())
+            await foreach (BinaryData item in client.GetConsortiumMembersAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("certificate").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("certificate").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
             }
         }
 
@@ -725,15 +674,14 @@ public async Task Example_GetConsortiumMembers_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetConsortiumMembers_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            await foreach (var item in client.GetConsortiumMembersAsync())
+            await foreach (BinaryData item in client.GetConsortiumMembersAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("certificate").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("certificate").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
             }
         }
 
@@ -741,14 +689,13 @@ public async Task Example_GetConsortiumMembers_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCollections()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            foreach (var item in client.GetCollections())
+            foreach (BinaryData item in client.GetCollections())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("collectionId").ToString());
+                Console.WriteLine(result[0].GetProperty("collectionId").ToString());
             }
         }
 
@@ -756,14 +703,13 @@ public void Example_GetCollections()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCollections_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            foreach (var item in client.GetCollections())
+            foreach (BinaryData item in client.GetCollections())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("collectionId").ToString());
+                Console.WriteLine(result[0].GetProperty("collectionId").ToString());
             }
         }
 
@@ -771,14 +717,13 @@ public void Example_GetCollections_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCollections_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            await foreach (var item in client.GetCollectionsAsync())
+            await foreach (BinaryData item in client.GetCollectionsAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("collectionId").ToString());
+                Console.WriteLine(result[0].GetProperty("collectionId").ToString());
             }
         }
 
@@ -786,14 +731,13 @@ public async Task Example_GetCollections_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCollections_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            await foreach (var item in client.GetCollectionsAsync())
+            await foreach (BinaryData item in client.GetCollectionsAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("collectionId").ToString());
+                Console.WriteLine(result[0].GetProperty("collectionId").ToString());
             }
         }
 
@@ -801,14 +745,13 @@ public async Task Example_GetCollections_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLedgerEntries()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            foreach (var item in client.GetLedgerEntries())
+            foreach (BinaryData item in client.GetLedgerEntries())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("contents").ToString());
+                Console.WriteLine(result[0].GetProperty("contents").ToString());
             }
         }
 
@@ -816,16 +759,15 @@ public void Example_GetLedgerEntries()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLedgerEntries_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            foreach (var item in client.GetLedgerEntries("<collectionId>", "<fromTransactionId>", "<toTransactionId>"))
+            foreach (BinaryData item in client.GetLedgerEntries(collectionId: "<collectionId>", fromTransactionId: "<fromTransactionId>", toTransactionId: "<toTransactionId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("contents").ToString());
-                Console.WriteLine(result.GetProperty("collectionId").ToString());
-                Console.WriteLine(result.GetProperty("transactionId").ToString());
+                Console.WriteLine(result[0].GetProperty("contents").ToString());
+                Console.WriteLine(result[0].GetProperty("collectionId").ToString());
+                Console.WriteLine(result[0].GetProperty("transactionId").ToString());
             }
         }
 
@@ -833,14 +775,13 @@ public void Example_GetLedgerEntries_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLedgerEntries_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            await foreach (var item in client.GetLedgerEntriesAsync())
+            await foreach (BinaryData item in client.GetLedgerEntriesAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("contents").ToString());
+                Console.WriteLine(result[0].GetProperty("contents").ToString());
             }
         }
 
@@ -848,16 +789,15 @@ public async Task Example_GetLedgerEntries_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLedgerEntries_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ConfidentialLedgerClient(endpoint, credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            ConfidentialLedgerClient client = new ConfidentialLedgerClient(new Uri("http://localhost:3000"), credential);
 
-            await foreach (var item in client.GetLedgerEntriesAsync("<collectionId>", "<fromTransactionId>", "<toTransactionId>"))
+            await foreach (BinaryData item in client.GetLedgerEntriesAsync(collectionId: "<collectionId>", fromTransactionId: "<fromTransactionId>", toTransactionId: "<toTransactionId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("contents").ToString());
-                Console.WriteLine(result.GetProperty("collectionId").ToString());
-                Console.WriteLine(result.GetProperty("transactionId").ToString());
+                Console.WriteLine(result[0].GetProperty("contents").ToString());
+                Console.WriteLine(result[0].GetProperty("collectionId").ToString());
+                Console.WriteLine(result[0].GetProperty("transactionId").ToString());
             }
         }
     }
diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/Docs/ContentSafetyClient.xml b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/Docs/ContentSafetyClient.xml
index 5482e93693c0..41cb2d02ba10 100644
--- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/Docs/ContentSafetyClient.xml
+++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/Docs/ContentSafetyClient.xml
@@ -2,88 +2,106 @@
 <doc>
   <members>
     <member name="AnalyzeTextAsync(AnalyzeTextOptions,CancellationToken)">
-<example>
-This sample shows how to call AnalyzeTextAsync with required parameters.
+      <example>
+This sample shows how to call AnalyzeTextAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var body = new AnalyzeTextOptions("<text>")
+AnalyzeTextOptions body = new AnalyzeTextOptions("<text>");
+Response<AnalyzeTextResult> response = await client.AnalyzeTextAsync(body);
+]]></code>
+This sample shows how to call AnalyzeTextAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+AnalyzeTextOptions body = new AnalyzeTextOptions("<text>")
 {
-    Categories = 
+    Categories =
 {
-        TextCategory.Hate
-    },
-    BlocklistNames = 
+TextCategory.Hate
+},
+    BlocklistNames =
 {
-        "<null>"
-    },
+"<blocklistNames>"
+},
     BreakByBlocklists = true,
 };
-var result = await client.AnalyzeTextAsync(body);
-]]></code>
-</example>
+Response<AnalyzeTextResult> response = await client.AnalyzeTextAsync(body);
+]]></code></example>
     </member>
     <member name="AnalyzeText(AnalyzeTextOptions,CancellationToken)">
-<example>
-This sample shows how to call AnalyzeText with required parameters.
+      <example>
+This sample shows how to call AnalyzeText.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+AnalyzeTextOptions body = new AnalyzeTextOptions("<text>");
+Response<AnalyzeTextResult> response = client.AnalyzeText(body);
+]]></code>
+This sample shows how to call AnalyzeText with all parameters.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var body = new AnalyzeTextOptions("<text>")
+AnalyzeTextOptions body = new AnalyzeTextOptions("<text>")
 {
-    Categories = 
+    Categories =
 {
-        TextCategory.Hate
-    },
-    BlocklistNames = 
+TextCategory.Hate
+},
+    BlocklistNames =
 {
-        "<null>"
-    },
+"<blocklistNames>"
+},
     BreakByBlocklists = true,
 };
-var result = client.AnalyzeText(body);
-]]></code>
-</example>
+Response<AnalyzeTextResult> response = client.AnalyzeText(body);
+]]></code></example>
     </member>
     <member name="AnalyzeTextAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call AnalyzeTextAsync with required request content, and how to parse the result.
+      <example>
+This sample shows how to call AnalyzeTextAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
-
-var data = new {
-    text = "<text>",
-};
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = await client.AnalyzeTextAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["text"] = "<text>",
+});
+Response response = await client.AnalyzeTextAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call AnalyzeTextAsync with all request content, and how to parse the result.
+This sample shows how to call AnalyzeTextAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var data = new {
-    text = "<text>",
-    categories = new[] {
-        "Hate"
-    },
-    blocklistNames = new[] {
-        "<String>"
-    },
-    breakByBlocklists = true,
-};
-
-Response response = await client.AnalyzeTextAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["text"] = "<text>",
+    ["categories"] = new List<object>()
+{
+"Hate"
+},
+    ["blocklistNames"] = new List<object>()
+{
+"<blocklistNames>"
+},
+    ["breakByBlocklists"] = true,
+});
+Response response = await client.AnalyzeTextAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("blocklistsMatchResults")[0].GetProperty("blocklistName").ToString());
@@ -99,44 +117,45 @@ Console.WriteLine(result.GetProperty("sexualResult").GetProperty("category").ToS
 Console.WriteLine(result.GetProperty("sexualResult").GetProperty("severity").ToString());
 Console.WriteLine(result.GetProperty("violenceResult").GetProperty("category").ToString());
 Console.WriteLine(result.GetProperty("violenceResult").GetProperty("severity").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="AnalyzeText(RequestContent,RequestContext)">
-<example>
-This sample shows how to call AnalyzeText with required request content, and how to parse the result.
+      <example>
+This sample shows how to call AnalyzeText and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var data = new {
-    text = "<text>",
-};
-
-Response response = client.AnalyzeText(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["text"] = "<text>",
+});
+Response response = client.AnalyzeText(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call AnalyzeText with all request content, and how to parse the result.
+This sample shows how to call AnalyzeText with all request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
-
-var data = new {
-    text = "<text>",
-    categories = new[] {
-        "Hate"
-    },
-    blocklistNames = new[] {
-        "<String>"
-    },
-    breakByBlocklists = true,
-};
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = client.AnalyzeText(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["text"] = "<text>",
+    ["categories"] = new List<object>()
+{
+"Hate"
+},
+    ["blocklistNames"] = new List<object>()
+{
+"<blocklistNames>"
+},
+    ["breakByBlocklists"] = true,
+});
+Response response = client.AnalyzeText(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("blocklistsMatchResults")[0].GetProperty("blocklistName").ToString());
@@ -152,89 +171,106 @@ Console.WriteLine(result.GetProperty("sexualResult").GetProperty("category").ToS
 Console.WriteLine(result.GetProperty("sexualResult").GetProperty("severity").ToString());
 Console.WriteLine(result.GetProperty("violenceResult").GetProperty("category").ToString());
 Console.WriteLine(result.GetProperty("violenceResult").GetProperty("severity").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="AnalyzeImageAsync(AnalyzeImageOptions,CancellationToken)">
-<example>
-This sample shows how to call AnalyzeImageAsync with required parameters.
+      <example>
+This sample shows how to call AnalyzeImageAsync.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+AnalyzeImageOptions body = new AnalyzeImageOptions(new ContentSafetyImageData());
+Response<AnalyzeImageResult> response = await client.AnalyzeImageAsync(body);
+]]></code>
+This sample shows how to call AnalyzeImageAsync with all parameters.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var body = new AnalyzeImageOptions(new ContentSafetyImageData()
+AnalyzeImageOptions body = new AnalyzeImageOptions(new ContentSafetyImageData()
 {
-    Content = BinaryData.FromString("<your binary data content>"),
+    Content = BinaryData.FromObjectAsJson(new Dictionary<string, object>()),
     BlobUrl = new Uri("http://localhost:3000"),
 })
 {
-    Categories = 
+    Categories =
 {
-        ImageCategory.Hate
-    },
+ImageCategory.Hate
+},
 };
-var result = await client.AnalyzeImageAsync(body);
-]]></code>
-</example>
+Response<AnalyzeImageResult> response = await client.AnalyzeImageAsync(body);
+]]></code></example>
     </member>
     <member name="AnalyzeImage(AnalyzeImageOptions,CancellationToken)">
-<example>
-This sample shows how to call AnalyzeImage with required parameters.
+      <example>
+This sample shows how to call AnalyzeImage.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+AnalyzeImageOptions body = new AnalyzeImageOptions(new ContentSafetyImageData());
+Response<AnalyzeImageResult> response = client.AnalyzeImage(body);
+]]></code>
+This sample shows how to call AnalyzeImage with all parameters.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var body = new AnalyzeImageOptions(new ContentSafetyImageData()
+AnalyzeImageOptions body = new AnalyzeImageOptions(new ContentSafetyImageData()
 {
-    Content = BinaryData.FromString("<your binary data content>"),
+    Content = BinaryData.FromObjectAsJson(new Dictionary<string, object>()),
     BlobUrl = new Uri("http://localhost:3000"),
 })
 {
-    Categories = 
+    Categories =
 {
-        ImageCategory.Hate
-    },
+ImageCategory.Hate
+},
 };
-var result = client.AnalyzeImage(body);
-]]></code>
-</example>
+Response<AnalyzeImageResult> response = client.AnalyzeImage(body);
+]]></code></example>
     </member>
     <member name="AnalyzeImageAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call AnalyzeImageAsync with required request content, and how to parse the result.
+      <example>
+This sample shows how to call AnalyzeImageAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
-
-var data = new {
-    image = new {},
-};
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = await client.AnalyzeImageAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["image"] = new Dictionary<string, object>(),
+});
+Response response = await client.AnalyzeImageAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call AnalyzeImageAsync with all request content, and how to parse the result.
+This sample shows how to call AnalyzeImageAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var data = new {
-    image = new {
-        content = new {},
-        blobUrl = "http://localhost:3000",
-    },
-    categories = new[] {
-        "Hate"
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["image"] = new Dictionary<string, object>()
+    {
+        ["content"] = new Dictionary<string, object>(),
+        ["blobUrl"] = "http://localhost:3000",
     },
-};
-
-Response response = await client.AnalyzeImageAsync(RequestContent.Create(data));
+    ["categories"] = new List<object>()
+{
+"Hate"
+},
+});
+Response response = await client.AnalyzeImageAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("hateResult").GetProperty("category").ToString());
@@ -245,43 +281,44 @@ Console.WriteLine(result.GetProperty("sexualResult").GetProperty("category").ToS
 Console.WriteLine(result.GetProperty("sexualResult").GetProperty("severity").ToString());
 Console.WriteLine(result.GetProperty("violenceResult").GetProperty("category").ToString());
 Console.WriteLine(result.GetProperty("violenceResult").GetProperty("severity").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="AnalyzeImage(RequestContent,RequestContext)">
-<example>
-This sample shows how to call AnalyzeImage with required request content, and how to parse the result.
+      <example>
+This sample shows how to call AnalyzeImage and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
-
-var data = new {
-    image = new {},
-};
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = client.AnalyzeImage(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["image"] = new Dictionary<string, object>(),
+});
+Response response = client.AnalyzeImage(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call AnalyzeImage with all request content, and how to parse the result.
+This sample shows how to call AnalyzeImage with all request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var data = new {
-    image = new {
-        content = new {},
-        blobUrl = "http://localhost:3000",
-    },
-    categories = new[] {
-        "Hate"
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["image"] = new Dictionary<string, object>()
+    {
+        ["content"] = new Dictionary<string, object>(),
+        ["blobUrl"] = "http://localhost:3000",
     },
-};
-
-Response response = client.AnalyzeImage(RequestContent.Create(data));
+    ["categories"] = new List<object>()
+{
+"Hate"
+},
+});
+Response response = client.AnalyzeImage(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("hateResult").GetProperty("category").ToString());
@@ -292,506 +329,795 @@ Console.WriteLine(result.GetProperty("sexualResult").GetProperty("category").ToS
 Console.WriteLine(result.GetProperty("sexualResult").GetProperty("severity").ToString());
 Console.WriteLine(result.GetProperty("violenceResult").GetProperty("category").ToString());
 Console.WriteLine(result.GetProperty("violenceResult").GetProperty("severity").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTextBlocklistAsync(string,CancellationToken)">
-<example>
-This sample shows how to call GetTextBlocklistAsync with required parameters.
+      <example>
+This sample shows how to call GetTextBlocklistAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var result = await client.GetTextBlocklistAsync("<blocklistName>");
+Response<TextBlocklist> response = await client.GetTextBlocklistAsync("<blocklistName>");
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklistAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+Response<TextBlocklist> response = await client.GetTextBlocklistAsync("<blocklistName>");
+]]></code></example>
     </member>
     <member name="GetTextBlocklist(string,CancellationToken)">
-<example>
-This sample shows how to call GetTextBlocklist with required parameters.
+      <example>
+This sample shows how to call GetTextBlocklist.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var result = client.GetTextBlocklist("<blocklistName>");
+Response<TextBlocklist> response = client.GetTextBlocklist("<blocklistName>");
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklist with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+Response<TextBlocklist> response = client.GetTextBlocklist("<blocklistName>");
+]]></code></example>
     </member>
     <member name="GetTextBlocklistAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetTextBlocklistAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTextBlocklistAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = await client.GetTextBlocklistAsync("<blocklistName>", new RequestContext());
+Response response = await client.GetTextBlocklistAsync("<blocklistName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("blocklistName").ToString());
-Console.WriteLine(result.GetProperty("description").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklistAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+Response response = await client.GetTextBlocklistAsync("<blocklistName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("blocklistName").ToString());
+Console.WriteLine(result.GetProperty("description").ToString());
+]]></code></example>
     </member>
     <member name="GetTextBlocklist(string,RequestContext)">
-<example>
-This sample shows how to call GetTextBlocklist with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTextBlocklist and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = client.GetTextBlocklist("<blocklistName>", new RequestContext());
+Response response = client.GetTextBlocklist("<blocklistName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("blocklistName").ToString());
-Console.WriteLine(result.GetProperty("description").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklist with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+Response response = client.GetTextBlocklist("<blocklistName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("blocklistName").ToString());
+Console.WriteLine(result.GetProperty("description").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateTextBlocklistAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateTextBlocklistAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateTextBlocklistAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
-
-var data = new {
-    blocklistName = "<blocklistName>",
-};
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = await client.CreateOrUpdateTextBlocklistAsync("<blocklistName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["blocklistName"] = "<blocklistName>",
+});
+Response response = await client.CreateOrUpdateTextBlocklistAsync("<blocklistName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("blocklistName").ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateTextBlocklistAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateTextBlocklistAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
-
-var data = new {
-    blocklistName = "<blocklistName>",
-    description = "<description>",
-};
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = await client.CreateOrUpdateTextBlocklistAsync("<blocklistName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["blocklistName"] = "<blocklistName>",
+    ["description"] = "<description>",
+});
+Response response = await client.CreateOrUpdateTextBlocklistAsync("<blocklistName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("blocklistName").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateTextBlocklist(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateTextBlocklist with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateTextBlocklist and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var data = new {
-    blocklistName = "<blocklistName>",
-};
-
-Response response = client.CreateOrUpdateTextBlocklist("<blocklistName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["blocklistName"] = "<blocklistName>",
+});
+Response response = client.CreateOrUpdateTextBlocklist("<blocklistName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("blocklistName").ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateTextBlocklist with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateTextBlocklist with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
-
-var data = new {
-    blocklistName = "<blocklistName>",
-    description = "<description>",
-};
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = client.CreateOrUpdateTextBlocklist("<blocklistName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["blocklistName"] = "<blocklistName>",
+    ["description"] = "<description>",
+});
+Response response = client.CreateOrUpdateTextBlocklist("<blocklistName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("blocklistName").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteTextBlocklistAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteTextBlocklistAsync with required parameters.
+      <example>
+This sample shows how to call DeleteTextBlocklistAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
 Response response = await client.DeleteTextBlocklistAsync("<blocklistName>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteTextBlocklistAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+Response response = await client.DeleteTextBlocklistAsync("<blocklistName>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteTextBlocklist(string,RequestContext)">
-<example>
-This sample shows how to call DeleteTextBlocklist with required parameters.
+      <example>
+This sample shows how to call DeleteTextBlocklist.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
 Response response = client.DeleteTextBlocklist("<blocklistName>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteTextBlocklist with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+Response response = client.DeleteTextBlocklist("<blocklistName>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="AddBlockItemsAsync(string,AddBlockItemsOptions,CancellationToken)">
-<example>
-This sample shows how to call AddBlockItemsAsync with required parameters.
+      <example>
+This sample shows how to call AddBlockItemsAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var addBlockItemsOptions = new AddBlockItemsOptions(new TextBlockItemInfo[] 
+AddBlockItemsOptions addBlockItemsOptions = new AddBlockItemsOptions(new List<TextBlockItemInfo>()
 {
-    new TextBlockItemInfo("<text>")
-{
-        Description = "<Description>",
-    }
+new TextBlockItemInfo("<text>")
 });
-var result = await client.AddBlockItemsAsync("<blocklistName>", addBlockItemsOptions);
+Response<AddBlockItemsResult> response = await client.AddBlockItemsAsync("<blocklistName>", addBlockItemsOptions);
 ]]></code>
-</example>
+This sample shows how to call AddBlockItemsAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+AddBlockItemsOptions addBlockItemsOptions = new AddBlockItemsOptions(new List<TextBlockItemInfo>()
+{
+new TextBlockItemInfo("<text>")
+{
+Description = "<description>",
+}
+});
+Response<AddBlockItemsResult> response = await client.AddBlockItemsAsync("<blocklistName>", addBlockItemsOptions);
+]]></code></example>
     </member>
     <member name="AddBlockItems(string,AddBlockItemsOptions,CancellationToken)">
-<example>
-This sample shows how to call AddBlockItems with required parameters.
+      <example>
+This sample shows how to call AddBlockItems.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var addBlockItemsOptions = new AddBlockItemsOptions(new TextBlockItemInfo[] 
-{
-    new TextBlockItemInfo("<text>")
+AddBlockItemsOptions addBlockItemsOptions = new AddBlockItemsOptions(new List<TextBlockItemInfo>()
 {
-        Description = "<Description>",
-    }
+new TextBlockItemInfo("<text>")
 });
-var result = client.AddBlockItems("<blocklistName>", addBlockItemsOptions);
+Response<AddBlockItemsResult> response = client.AddBlockItems("<blocklistName>", addBlockItemsOptions);
 ]]></code>
-</example>
+This sample shows how to call AddBlockItems with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+AddBlockItemsOptions addBlockItemsOptions = new AddBlockItemsOptions(new List<TextBlockItemInfo>()
+{
+new TextBlockItemInfo("<text>")
+{
+Description = "<description>",
+}
+});
+Response<AddBlockItemsResult> response = client.AddBlockItems("<blocklistName>", addBlockItemsOptions);
+]]></code></example>
     </member>
     <member name="AddBlockItemsAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call AddBlockItemsAsync with required parameters and request content and parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
-
-var data = new {
-    blockItems = new[] {
-        new {
-            description = "<description>",
-            text = "<text>",
-        }
-    },
-};
+      <example>
+This sample shows how to call AddBlockItemsAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = await client.AddBlockItemsAsync("<blocklistName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["blockItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["text"] = "<text>",
+}
+},
+});
+Response response = await client.AddBlockItemsAsync("<blocklistName>", content);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call AddBlockItemsAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["blockItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["text"] = "<text>",
+}
+},
+});
+Response response = await client.AddBlockItemsAsync("<blocklistName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("blockItemId").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("text").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="AddBlockItems(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call AddBlockItems with required parameters and request content and parse the result.
-<code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
-
-var data = new {
-    blockItems = new[] {
-        new {
-            description = "<description>",
-            text = "<text>",
-        }
-    },
-};
+      <example>
+This sample shows how to call AddBlockItems and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = client.AddBlockItems("<blocklistName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["blockItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["text"] = "<text>",
+}
+},
+});
+Response response = client.AddBlockItems("<blocklistName>", content);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call AddBlockItems with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["blockItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["text"] = "<text>",
+}
+},
+});
+Response response = client.AddBlockItems("<blocklistName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("blockItemId").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("text").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RemoveBlockItemsAsync(string,RemoveBlockItemsOptions,CancellationToken)">
-<example>
-This sample shows how to call RemoveBlockItemsAsync with required parameters.
+      <example>
+This sample shows how to call RemoveBlockItemsAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var removeBlockItemsOptions = new RemoveBlockItemsOptions(new string[] 
+RemoveBlockItemsOptions removeBlockItemsOptions = new RemoveBlockItemsOptions(new List<string>()
 {
-    "<null>"
+"<blockItemIds>"
 });
-var result = await client.RemoveBlockItemsAsync("<blocklistName>", removeBlockItemsOptions);
+Response response = await client.RemoveBlockItemsAsync("<blocklistName>", removeBlockItemsOptions);
+Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call RemoveBlockItemsAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+RemoveBlockItemsOptions removeBlockItemsOptions = new RemoveBlockItemsOptions(new List<string>()
+{
+"<blockItemIds>"
+});
+Response response = await client.RemoveBlockItemsAsync("<blocklistName>", removeBlockItemsOptions);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="RemoveBlockItems(string,RemoveBlockItemsOptions,CancellationToken)">
-<example>
-This sample shows how to call RemoveBlockItems with required parameters.
+      <example>
+This sample shows how to call RemoveBlockItems.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var removeBlockItemsOptions = new RemoveBlockItemsOptions(new string[] 
+RemoveBlockItemsOptions removeBlockItemsOptions = new RemoveBlockItemsOptions(new List<string>()
 {
-    "<null>"
+"<blockItemIds>"
 });
-var result = client.RemoveBlockItems("<blocklistName>", removeBlockItemsOptions);
+Response response = client.RemoveBlockItems("<blocklistName>", removeBlockItemsOptions);
+Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call RemoveBlockItems with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+RemoveBlockItemsOptions removeBlockItemsOptions = new RemoveBlockItemsOptions(new List<string>()
+{
+"<blockItemIds>"
+});
+Response response = client.RemoveBlockItems("<blocklistName>", removeBlockItemsOptions);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="RemoveBlockItemsAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call RemoveBlockItemsAsync with required parameters and request content.
+      <example>
+This sample shows how to call RemoveBlockItemsAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
-
-var data = new {
-    blockItemIds = new[] {
-        "<String>"
-    },
-};
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = await client.RemoveBlockItemsAsync("<blocklistName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["blockItemIds"] = new List<object>()
+{
+"<blockItemIds>"
+},
+});
+Response response = await client.RemoveBlockItemsAsync("<blocklistName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call RemoveBlockItemsAsync with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["blockItemIds"] = new List<object>()
+{
+"<blockItemIds>"
+},
+});
+Response response = await client.RemoveBlockItemsAsync("<blocklistName>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="RemoveBlockItems(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call RemoveBlockItems with required parameters and request content.
+      <example>
+This sample shows how to call RemoveBlockItems.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
-
-var data = new {
-    blockItemIds = new[] {
-        "<String>"
-    },
-};
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = client.RemoveBlockItems("<blocklistName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["blockItemIds"] = new List<object>()
+{
+"<blockItemIds>"
+},
+});
+Response response = client.RemoveBlockItems("<blocklistName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call RemoveBlockItems with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["blockItemIds"] = new List<object>()
+{
+"<blockItemIds>"
+},
+});
+Response response = client.RemoveBlockItems("<blocklistName>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetTextBlocklistItemAsync(string,string,CancellationToken)">
-<example>
-This sample shows how to call GetTextBlocklistItemAsync with required parameters.
+      <example>
+This sample shows how to call GetTextBlocklistItemAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var result = await client.GetTextBlocklistItemAsync("<blocklistName>", "<blockItemId>");
+Response<TextBlockItem> response = await client.GetTextBlocklistItemAsync("<blocklistName>", "<blockItemId>");
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklistItemAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+Response<TextBlockItem> response = await client.GetTextBlocklistItemAsync("<blocklistName>", "<blockItemId>");
+]]></code></example>
     </member>
     <member name="GetTextBlocklistItem(string,string,CancellationToken)">
-<example>
-This sample shows how to call GetTextBlocklistItem with required parameters.
+      <example>
+This sample shows how to call GetTextBlocklistItem.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-var result = client.GetTextBlocklistItem("<blocklistName>", "<blockItemId>");
+Response<TextBlockItem> response = client.GetTextBlocklistItem("<blocklistName>", "<blockItemId>");
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklistItem with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+Response<TextBlockItem> response = client.GetTextBlocklistItem("<blocklistName>", "<blockItemId>");
+]]></code></example>
     </member>
     <member name="GetTextBlocklistItemAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetTextBlocklistItemAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTextBlocklistItemAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = await client.GetTextBlocklistItemAsync("<blocklistName>", "<blockItemId>", new RequestContext());
+Response response = await client.GetTextBlocklistItemAsync("<blocklistName>", "<blockItemId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("blockItemId").ToString());
-Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("text").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklistItemAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+Response response = await client.GetTextBlocklistItemAsync("<blocklistName>", "<blockItemId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("blockItemId").ToString());
+Console.WriteLine(result.GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("text").ToString());
+]]></code></example>
     </member>
     <member name="GetTextBlocklistItem(string,string,RequestContext)">
-<example>
-This sample shows how to call GetTextBlocklistItem with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTextBlocklistItem and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-Response response = client.GetTextBlocklistItem("<blocklistName>", "<blockItemId>", new RequestContext());
+Response response = client.GetTextBlocklistItem("<blocklistName>", "<blockItemId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("blockItemId").ToString());
-Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("text").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklistItem with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+Response response = client.GetTextBlocklistItem("<blocklistName>", "<blockItemId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("blockItemId").ToString());
+Console.WriteLine(result.GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("text").ToString());
+]]></code></example>
     </member>
     <member name="GetTextBlocklistsAsync(CancellationToken)">
-<example>
+      <example>
 This sample shows how to call GetTextBlocklistsAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-await foreach (var item in client.GetTextBlocklistsAsync())
+await foreach (TextBlocklist item in client.GetTextBlocklistsAsync())
 {
 }
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklistsAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+await foreach (TextBlocklist item in client.GetTextBlocklistsAsync())
+{
+}
+]]></code></example>
     </member>
     <member name="GetTextBlocklists(CancellationToken)">
-<example>
+      <example>
 This sample shows how to call GetTextBlocklists.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-foreach (var item in client.GetTextBlocklists())
+foreach (TextBlocklist item in client.GetTextBlocklists())
 {
 }
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklists with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+foreach (TextBlocklist item in client.GetTextBlocklists())
+{
+}
+]]></code></example>
     </member>
     <member name="GetTextBlocklistsAsync(RequestContext)">
-<example>
-This sample shows how to call GetTextBlocklistsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTextBlocklistsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-await foreach (var item in client.GetTextBlocklistsAsync(new RequestContext()))
+await foreach (BinaryData item in client.GetTextBlocklistsAsync(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("blocklistName").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("blocklistName").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklistsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetTextBlocklistsAsync(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("blocklistName").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetTextBlocklists(RequestContext)">
-<example>
-This sample shows how to call GetTextBlocklists with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTextBlocklists and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-foreach (var item in client.GetTextBlocklists(new RequestContext()))
+foreach (BinaryData item in client.GetTextBlocklists(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("blocklistName").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("blocklistName").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklists with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetTextBlocklists(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("blocklistName").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetTextBlocklistItemsAsync(string,int?,int?,int?,CancellationToken)">
-<example>
-This sample shows how to call GetTextBlocklistItemsAsync with required parameters.
+      <example>
+This sample shows how to call GetTextBlocklistItemsAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-await foreach (var item in client.GetTextBlocklistItemsAsync("<blocklistName>", 1234, 1234, 1234))
+await foreach (TextBlockItem item in client.GetTextBlocklistItemsAsync("<blocklistName>"))
 {
 }
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklistItemsAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+await foreach (TextBlockItem item in client.GetTextBlocklistItemsAsync("<blocklistName>", maxCount: 1234, skip: 1234, maxpagesize: 1234))
+{
+}
+]]></code></example>
     </member>
     <member name="GetTextBlocklistItems(string,int?,int?,int?,CancellationToken)">
-<example>
-This sample shows how to call GetTextBlocklistItems with required parameters.
+      <example>
+This sample shows how to call GetTextBlocklistItems.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-foreach (var item in client.GetTextBlocklistItems("<blocklistName>", 1234, 1234, 1234))
+foreach (TextBlockItem item in client.GetTextBlocklistItems("<blocklistName>"))
 {
 }
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklistItems with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+foreach (TextBlockItem item in client.GetTextBlocklistItems("<blocklistName>", maxCount: 1234, skip: 1234, maxpagesize: 1234))
+{
+}
+]]></code></example>
     </member>
     <member name="GetTextBlocklistItemsAsync(string,int?,int?,int?,RequestContext)">
-<example>
-This sample shows how to call GetTextBlocklistItemsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTextBlocklistItemsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-await foreach (var item in client.GetTextBlocklistItemsAsync("<blocklistName>", 1234, 1234, 1234, new RequestContext()))
+await foreach (BinaryData item in client.GetTextBlocklistItemsAsync("<blocklistName>", null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("blockItemId").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("text").ToString());
+    Console.WriteLine(result[0].GetProperty("blockItemId").ToString());
+    Console.WriteLine(result[0].GetProperty("text").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklistItemsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetTextBlocklistItemsAsync("<blocklistName>", 1234, 1234, 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("blockItemId").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("text").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetTextBlocklistItems(string,int?,int?,int?,RequestContext)">
-<example>
-This sample shows how to call GetTextBlocklistItems with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTextBlocklistItems and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ContentSafetyClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-foreach (var item in client.GetTextBlocklistItems("<blocklistName>", 1234, 1234, 1234, new RequestContext()))
+foreach (BinaryData item in client.GetTextBlocklistItems("<blocklistName>", null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("blockItemId").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("text").ToString());
+    Console.WriteLine(result[0].GetProperty("blockItemId").ToString());
+    Console.WriteLine(result[0].GetProperty("text").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetTextBlocklistItems with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetTextBlocklistItems("<blocklistName>", 1234, 1234, 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("blockItemId").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("text").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/tests/Generated/Samples/Samples_ContentSafetyClient.cs b/sdk/contentsafety/Azure.AI.ContentSafety/tests/Generated/Samples/Samples_ContentSafetyClient.cs
index 84d064d776a3..3fc10cc3ae52 100644
--- a/sdk/contentsafety/Azure.AI.ContentSafety/tests/Generated/Samples/Samples_ContentSafetyClient.cs
+++ b/sdk/contentsafety/Azure.AI.ContentSafety/tests/Generated/Samples/Samples_ContentSafetyClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.AI.ContentSafety;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,16 +23,15 @@ public class Samples_ContentSafetyClient
         [Ignore("Only validating compilation of examples")]
         public void Example_AnalyzeText()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                text = "<text>",
-            };
-
-            Response response = client.AnalyzeText(RequestContent.Create(data));
+                ["text"] = "<text>",
+            });
+            Response response = client.AnalyzeText(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -42,23 +41,24 @@ public void Example_AnalyzeText()
         [Ignore("Only validating compilation of examples")]
         public void Example_AnalyzeText_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                text = "<text>",
-                categories = new[] {
-        "Hate"
-    },
-                blocklistNames = new[] {
-        "<String>"
-    },
-                breakByBlocklists = true,
-            };
-
-            Response response = client.AnalyzeText(RequestContent.Create(data));
+                ["text"] = "<text>",
+                ["categories"] = new List<object>()
+{
+"Hate"
+},
+                ["blocklistNames"] = new List<object>()
+{
+"<blocklistNames>"
+},
+                ["breakByBlocklists"] = true,
+            });
+            Response response = client.AnalyzeText(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("blocklistsMatchResults")[0].GetProperty("blocklistName").ToString());
@@ -78,18 +78,52 @@ public void Example_AnalyzeText_AllParameters()
 
         [Test]
         [Ignore("Only validating compilation of examples")]
-        public async Task Example_AnalyzeText_Async()
+        public void Example_AnalyzeText_Convenience()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            AnalyzeTextOptions body = new AnalyzeTextOptions("<text>");
+            Response<AnalyzeTextResult> response = client.AnalyzeText(body);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_AnalyzeText_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            AnalyzeTextOptions body = new AnalyzeTextOptions("<text>")
             {
-                text = "<text>",
+                Categories =
+{
+TextCategory.Hate
+},
+                BlocklistNames =
+{
+"<blocklistNames>"
+},
+                BreakByBlocklists = true,
             };
+            Response<AnalyzeTextResult> response = client.AnalyzeText(body);
+        }
 
-            Response response = await client.AnalyzeTextAsync(RequestContent.Create(data));
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_AnalyzeText_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+            {
+                ["text"] = "<text>",
+            });
+            Response response = await client.AnalyzeTextAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -99,23 +133,24 @@ public async Task Example_AnalyzeText_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AnalyzeText_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                text = "<text>",
-                categories = new[] {
-        "Hate"
-    },
-                blocklistNames = new[] {
-        "<String>"
-    },
-                breakByBlocklists = true,
-            };
-
-            Response response = await client.AnalyzeTextAsync(RequestContent.Create(data));
+                ["text"] = "<text>",
+                ["categories"] = new List<object>()
+{
+"Hate"
+},
+                ["blocklistNames"] = new List<object>()
+{
+"<blocklistNames>"
+},
+                ["breakByBlocklists"] = true,
+            });
+            Response response = await client.AnalyzeTextAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("blocklistsMatchResults")[0].GetProperty("blocklistName").ToString());
@@ -137,39 +172,50 @@ public async Task Example_AnalyzeText_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AnalyzeText_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            AnalyzeTextOptions body = new AnalyzeTextOptions("<text>");
+            Response<AnalyzeTextResult> response = await client.AnalyzeTextAsync(body);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_AnalyzeText_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var body = new AnalyzeTextOptions("<text>")
+            AnalyzeTextOptions body = new AnalyzeTextOptions("<text>")
             {
                 Categories =
 {
-        TextCategory.Hate
-    },
+TextCategory.Hate
+},
                 BlocklistNames =
 {
-        "<null>"
-    },
+"<blocklistNames>"
+},
                 BreakByBlocklists = true,
             };
-            var result = await client.AnalyzeTextAsync(body);
+            Response<AnalyzeTextResult> response = await client.AnalyzeTextAsync(body);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_AnalyzeImage()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                image = new { },
-            };
-
-            Response response = client.AnalyzeImage(RequestContent.Create(data));
+                ["image"] = new Dictionary<string, object>(),
+            });
+            Response response = client.AnalyzeImage(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -179,23 +225,23 @@ public void Example_AnalyzeImage()
         [Ignore("Only validating compilation of examples")]
         public void Example_AnalyzeImage_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                image = new
+                ["image"] = new Dictionary<string, object>()
                 {
-                    content = new { },
-                    blobUrl = "http://localhost:3000",
+                    ["content"] = new Dictionary<string, object>(),
+                    ["blobUrl"] = "http://localhost:3000",
                 },
-                categories = new[] {
-        "Hate"
-    },
-            };
-
-            Response response = client.AnalyzeImage(RequestContent.Create(data));
+                ["categories"] = new List<object>()
+{
+"Hate"
+},
+            });
+            Response response = client.AnalyzeImage(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("hateResult").GetProperty("category").ToString());
@@ -210,18 +256,51 @@ public void Example_AnalyzeImage_AllParameters()
 
         [Test]
         [Ignore("Only validating compilation of examples")]
-        public async Task Example_AnalyzeImage_Async()
+        public void Example_AnalyzeImage_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            AnalyzeImageOptions body = new AnalyzeImageOptions(new ContentSafetyImageData());
+            Response<AnalyzeImageResult> response = client.AnalyzeImage(body);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_AnalyzeImage_AllParameters_Convenience()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            AnalyzeImageOptions body = new AnalyzeImageOptions(new ContentSafetyImageData()
+            {
+                Content = BinaryData.FromObjectAsJson(new Dictionary<string, object>()),
+                BlobUrl = new Uri("http://localhost:3000"),
+            })
             {
-                image = new { },
+                Categories =
+{
+ImageCategory.Hate
+},
             };
+            Response<AnalyzeImageResult> response = client.AnalyzeImage(body);
+        }
 
-            Response response = await client.AnalyzeImageAsync(RequestContent.Create(data));
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_AnalyzeImage_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+            {
+                ["image"] = new Dictionary<string, object>(),
+            });
+            Response response = await client.AnalyzeImageAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -231,23 +310,23 @@ public async Task Example_AnalyzeImage_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AnalyzeImage_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                image = new
+                ["image"] = new Dictionary<string, object>()
                 {
-                    content = new { },
-                    blobUrl = "http://localhost:3000",
+                    ["content"] = new Dictionary<string, object>(),
+                    ["blobUrl"] = "http://localhost:3000",
                 },
-                categories = new[] {
-        "Hate"
-    },
-            };
-
-            Response response = await client.AnalyzeImageAsync(RequestContent.Create(data));
+                ["categories"] = new List<object>()
+{
+"Hate"
+},
+            });
+            Response response = await client.AnalyzeImageAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("hateResult").GetProperty("category").ToString());
@@ -264,33 +343,45 @@ public async Task Example_AnalyzeImage_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AnalyzeImage_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var body = new AnalyzeImageOptions(new ContentSafetyImageData()
+            AnalyzeImageOptions body = new AnalyzeImageOptions(new ContentSafetyImageData());
+            Response<AnalyzeImageResult> response = await client.AnalyzeImageAsync(body);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_AnalyzeImage_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            AnalyzeImageOptions body = new AnalyzeImageOptions(new ContentSafetyImageData()
             {
-                Content = BinaryData.FromString("<your binary data content>"),
+                Content = BinaryData.FromObjectAsJson(new Dictionary<string, object>()),
                 BlobUrl = new Uri("http://localhost:3000"),
             })
             {
                 Categories =
 {
-        ImageCategory.Hate
-    },
+ImageCategory.Hate
+},
             };
-            var result = await client.AnalyzeImageAsync(body);
+            Response<AnalyzeImageResult> response = await client.AnalyzeImageAsync(body);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTextBlocklist()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            Response response = client.GetTextBlocklist("<blocklistName>", new RequestContext());
+            Response response = client.GetTextBlocklist("<blocklistName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("blocklistName").ToString());
@@ -300,26 +391,48 @@ public void Example_GetTextBlocklist()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTextBlocklist_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            Response response = client.GetTextBlocklist("<blocklistName>", new RequestContext());
+            Response response = client.GetTextBlocklist("<blocklistName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("blocklistName").ToString());
             Console.WriteLine(result.GetProperty("description").ToString());
         }
 
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_GetTextBlocklist_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            Response<TextBlocklist> response = client.GetTextBlocklist("<blocklistName>");
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_GetTextBlocklist_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            Response<TextBlocklist> response = client.GetTextBlocklist("<blocklistName>");
+        }
+
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTextBlocklist_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            Response response = await client.GetTextBlocklistAsync("<blocklistName>", new RequestContext());
+            Response response = await client.GetTextBlocklistAsync("<blocklistName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("blocklistName").ToString());
@@ -329,11 +442,11 @@ public async Task Example_GetTextBlocklist_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTextBlocklist_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            Response response = await client.GetTextBlocklistAsync("<blocklistName>", new RequestContext());
+            Response response = await client.GetTextBlocklistAsync("<blocklistName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("blocklistName").ToString());
@@ -344,27 +457,37 @@ public async Task Example_GetTextBlocklist_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTextBlocklist_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            Response<TextBlocklist> response = await client.GetTextBlocklistAsync("<blocklistName>");
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_GetTextBlocklist_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var result = await client.GetTextBlocklistAsync("<blocklistName>");
+            Response<TextBlocklist> response = await client.GetTextBlocklistAsync("<blocklistName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateTextBlocklist()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                blocklistName = "<blocklistName>",
-            };
-
-            Response response = client.CreateOrUpdateTextBlocklist("<blocklistName>", RequestContent.Create(data));
+                ["blocklistName"] = "<blocklistName>",
+            });
+            Response response = client.CreateOrUpdateTextBlocklist("<blocklistName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("blocklistName").ToString());
@@ -374,17 +497,16 @@ public void Example_CreateOrUpdateTextBlocklist()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateTextBlocklist_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                blocklistName = "<blocklistName>",
-                description = "<description>",
-            };
-
-            Response response = client.CreateOrUpdateTextBlocklist("<blocklistName>", RequestContent.Create(data));
+                ["blocklistName"] = "<blocklistName>",
+                ["description"] = "<description>",
+            });
+            Response response = client.CreateOrUpdateTextBlocklist("<blocklistName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("blocklistName").ToString());
@@ -395,16 +517,15 @@ public void Example_CreateOrUpdateTextBlocklist_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateTextBlocklist_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                blocklistName = "<blocklistName>",
-            };
-
-            Response response = await client.CreateOrUpdateTextBlocklistAsync("<blocklistName>", RequestContent.Create(data));
+                ["blocklistName"] = "<blocklistName>",
+            });
+            Response response = await client.CreateOrUpdateTextBlocklistAsync("<blocklistName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("blocklistName").ToString());
@@ -414,17 +535,16 @@ public async Task Example_CreateOrUpdateTextBlocklist_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateTextBlocklist_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                blocklistName = "<blocklistName>",
-                description = "<description>",
-            };
-
-            Response response = await client.CreateOrUpdateTextBlocklistAsync("<blocklistName>", RequestContent.Create(data));
+                ["blocklistName"] = "<blocklistName>",
+                ["description"] = "<description>",
+            });
+            Response response = await client.CreateOrUpdateTextBlocklistAsync("<blocklistName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("blocklistName").ToString());
@@ -435,9 +555,9 @@ public async Task Example_CreateOrUpdateTextBlocklist_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTextBlocklist()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
             Response response = client.DeleteTextBlocklist("<blocklistName>");
             Console.WriteLine(response.Status);
@@ -447,9 +567,9 @@ public void Example_DeleteTextBlocklist()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTextBlocklist_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
             Response response = client.DeleteTextBlocklist("<blocklistName>");
             Console.WriteLine(response.Status);
@@ -459,9 +579,9 @@ public void Example_DeleteTextBlocklist_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTextBlocklist_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
             Response response = await client.DeleteTextBlocklistAsync("<blocklistName>");
             Console.WriteLine(response.Status);
@@ -471,9 +591,9 @@ public async Task Example_DeleteTextBlocklist_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTextBlocklist_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
             Response response = await client.DeleteTextBlocklistAsync("<blocklistName>");
             Console.WriteLine(response.Status);
@@ -483,20 +603,21 @@ public async Task Example_DeleteTextBlocklist_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddBlockItems()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                blockItems = new[] {
-        new {
-            text = "<text>",
-        }
-    },
-            };
-
-            Response response = client.AddBlockItems("<blocklistName>", RequestContent.Create(data));
+                ["blockItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["text"] = "<text>",
+}
+},
+            });
+            Response response = client.AddBlockItems("<blocklistName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -506,21 +627,22 @@ public void Example_AddBlockItems()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddBlockItems_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                blockItems = new[] {
-        new {
-            description = "<description>",
-            text = "<text>",
-        }
-    },
-            };
-
-            Response response = client.AddBlockItems("<blocklistName>", RequestContent.Create(data));
+                ["blockItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["text"] = "<text>",
+}
+},
+            });
+            Response response = client.AddBlockItems("<blocklistName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("value")[0].GetProperty("blockItemId").ToString());
@@ -530,22 +652,56 @@ public void Example_AddBlockItems_AllParameters()
 
         [Test]
         [Ignore("Only validating compilation of examples")]
-        public async Task Example_AddBlockItems_Async()
+        public void Example_AddBlockItems_Convenience()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
-            {
-                blockItems = new[] {
-        new {
-            text = "<text>",
+            AddBlockItemsOptions addBlockItemsOptions = new AddBlockItemsOptions(new List<TextBlockItemInfo>()
+{
+new TextBlockItemInfo("<text>")
+});
+            Response<AddBlockItemsResult> response = client.AddBlockItems("<blocklistName>", addBlockItemsOptions);
         }
-    },
-            };
 
-            Response response = await client.AddBlockItemsAsync("<blocklistName>", RequestContent.Create(data));
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_AddBlockItems_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            AddBlockItemsOptions addBlockItemsOptions = new AddBlockItemsOptions(new List<TextBlockItemInfo>()
+{
+new TextBlockItemInfo("<text>")
+{
+Description = "<description>",
+}
+});
+            Response<AddBlockItemsResult> response = client.AddBlockItems("<blocklistName>", addBlockItemsOptions);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_AddBlockItems_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+            {
+                ["blockItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["text"] = "<text>",
+}
+},
+            });
+            Response response = await client.AddBlockItemsAsync("<blocklistName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -555,21 +711,22 @@ public async Task Example_AddBlockItems_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddBlockItems_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                blockItems = new[] {
-        new {
-            description = "<description>",
-            text = "<text>",
-        }
-    },
-            };
-
-            Response response = await client.AddBlockItemsAsync("<blocklistName>", RequestContent.Create(data));
+                ["blockItems"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["text"] = "<text>",
+}
+},
+            });
+            Response response = await client.AddBlockItemsAsync("<blocklistName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("value")[0].GetProperty("blockItemId").ToString());
@@ -581,36 +738,51 @@ public async Task Example_AddBlockItems_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddBlockItems_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var addBlockItemsOptions = new AddBlockItemsOptions(new TextBlockItemInfo[]
-            {
-    new TextBlockItemInfo("<text>")
+            AddBlockItemsOptions addBlockItemsOptions = new AddBlockItemsOptions(new List<TextBlockItemInfo>()
 {
-        Description = "<Description>",
-    }
-            });
-            var result = await client.AddBlockItemsAsync("<blocklistName>", addBlockItemsOptions);
+new TextBlockItemInfo("<text>")
+});
+            Response<AddBlockItemsResult> response = await client.AddBlockItemsAsync("<blocklistName>", addBlockItemsOptions);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_AddBlockItems_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            AddBlockItemsOptions addBlockItemsOptions = new AddBlockItemsOptions(new List<TextBlockItemInfo>()
+{
+new TextBlockItemInfo("<text>")
+{
+Description = "<description>",
+}
+});
+            Response<AddBlockItemsResult> response = await client.AddBlockItemsAsync("<blocklistName>", addBlockItemsOptions);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_RemoveBlockItems()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                blockItemIds = new[] {
-        "<String>"
-    },
-            };
-
-            Response response = client.RemoveBlockItems("<blocklistName>", RequestContent.Create(data));
+                ["blockItemIds"] = new List<object>()
+{
+"<blockItemIds>"
+},
+            });
+            Response response = client.RemoveBlockItems("<blocklistName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -618,18 +790,50 @@ public void Example_RemoveBlockItems()
         [Ignore("Only validating compilation of examples")]
         public void Example_RemoveBlockItems_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                blockItemIds = new[] {
-        "<String>"
-    },
-            };
+                ["blockItemIds"] = new List<object>()
+{
+"<blockItemIds>"
+},
+            });
+            Response response = client.RemoveBlockItems("<blocklistName>", content);
+            Console.WriteLine(response.Status);
+        }
 
-            Response response = client.RemoveBlockItems("<blocklistName>", RequestContent.Create(data));
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_RemoveBlockItems_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            RemoveBlockItemsOptions removeBlockItemsOptions = new RemoveBlockItemsOptions(new List<string>()
+{
+"<blockItemIds>"
+});
+            Response response = client.RemoveBlockItems("<blocklistName>", removeBlockItemsOptions);
+            Console.WriteLine(response.Status);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_RemoveBlockItems_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            RemoveBlockItemsOptions removeBlockItemsOptions = new RemoveBlockItemsOptions(new List<string>()
+{
+"<blockItemIds>"
+});
+            Response response = client.RemoveBlockItems("<blocklistName>", removeBlockItemsOptions);
             Console.WriteLine(response.Status);
         }
 
@@ -637,18 +841,18 @@ public void Example_RemoveBlockItems_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RemoveBlockItems_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                blockItemIds = new[] {
-        "<String>"
-    },
-            };
-
-            Response response = await client.RemoveBlockItemsAsync("<blocklistName>", RequestContent.Create(data));
+                ["blockItemIds"] = new List<object>()
+{
+"<blockItemIds>"
+},
+            });
+            Response response = await client.RemoveBlockItemsAsync("<blocklistName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -656,18 +860,18 @@ public async Task Example_RemoveBlockItems_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RemoveBlockItems_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                blockItemIds = new[] {
-        "<String>"
-    },
-            };
-
-            Response response = await client.RemoveBlockItemsAsync("<blocklistName>", RequestContent.Create(data));
+                ["blockItemIds"] = new List<object>()
+{
+"<blockItemIds>"
+},
+            });
+            Response response = await client.RemoveBlockItemsAsync("<blocklistName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -675,26 +879,43 @@ public async Task Example_RemoveBlockItems_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RemoveBlockItems_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var removeBlockItemsOptions = new RemoveBlockItemsOptions(new string[]
-            {
-    "<null>"
-            });
-            var result = await client.RemoveBlockItemsAsync("<blocklistName>", removeBlockItemsOptions);
+            RemoveBlockItemsOptions removeBlockItemsOptions = new RemoveBlockItemsOptions(new List<string>()
+{
+"<blockItemIds>"
+});
+            Response response = await client.RemoveBlockItemsAsync("<blocklistName>", removeBlockItemsOptions);
+            Console.WriteLine(response.Status);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_RemoveBlockItems_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            RemoveBlockItemsOptions removeBlockItemsOptions = new RemoveBlockItemsOptions(new List<string>()
+{
+"<blockItemIds>"
+});
+            Response response = await client.RemoveBlockItemsAsync("<blocklistName>", removeBlockItemsOptions);
+            Console.WriteLine(response.Status);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTextBlocklistItem()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            Response response = client.GetTextBlocklistItem("<blocklistName>", "<blockItemId>", new RequestContext());
+            Response response = client.GetTextBlocklistItem("<blocklistName>", "<blockItemId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("blockItemId").ToString());
@@ -705,11 +926,11 @@ public void Example_GetTextBlocklistItem()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTextBlocklistItem_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            Response response = client.GetTextBlocklistItem("<blocklistName>", "<blockItemId>", new RequestContext());
+            Response response = client.GetTextBlocklistItem("<blocklistName>", "<blockItemId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("blockItemId").ToString());
@@ -717,15 +938,37 @@ public void Example_GetTextBlocklistItem_AllParameters()
             Console.WriteLine(result.GetProperty("text").ToString());
         }
 
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_GetTextBlocklistItem_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            Response<TextBlockItem> response = client.GetTextBlocklistItem("<blocklistName>", "<blockItemId>");
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_GetTextBlocklistItem_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            Response<TextBlockItem> response = client.GetTextBlocklistItem("<blocklistName>", "<blockItemId>");
+        }
+
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTextBlocklistItem_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            Response response = await client.GetTextBlocklistItemAsync("<blocklistName>", "<blockItemId>", new RequestContext());
+            Response response = await client.GetTextBlocklistItemAsync("<blocklistName>", "<blockItemId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("blockItemId").ToString());
@@ -736,11 +979,11 @@ public async Task Example_GetTextBlocklistItem_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTextBlocklistItem_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            Response response = await client.GetTextBlocklistItemAsync("<blocklistName>", "<blockItemId>", new RequestContext());
+            Response response = await client.GetTextBlocklistItemAsync("<blocklistName>", "<blockItemId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("blockItemId").ToString());
@@ -752,25 +995,36 @@ public async Task Example_GetTextBlocklistItem_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTextBlocklistItem_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            Response<TextBlockItem> response = await client.GetTextBlocklistItemAsync("<blocklistName>", "<blockItemId>");
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_GetTextBlocklistItem_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            var result = await client.GetTextBlocklistItemAsync("<blocklistName>", "<blockItemId>");
+            Response<TextBlockItem> response = await client.GetTextBlocklistItemAsync("<blocklistName>", "<blockItemId>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTextBlocklists()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            foreach (var item in client.GetTextBlocklists(new RequestContext()))
+            foreach (BinaryData item in client.GetTextBlocklists(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("blocklistName").ToString());
+                Console.WriteLine(result[0].GetProperty("blocklistName").ToString());
             }
         }
 
@@ -778,15 +1032,41 @@ public void Example_GetTextBlocklists()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTextBlocklists_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            foreach (var item in client.GetTextBlocklists(new RequestContext()))
+            foreach (BinaryData item in client.GetTextBlocklists(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("blocklistName").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("blocklistName").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+            }
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_GetTextBlocklists_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            foreach (TextBlocklist item in client.GetTextBlocklists())
+            {
+            }
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_GetTextBlocklists_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            foreach (TextBlocklist item in client.GetTextBlocklists())
+            {
             }
         }
 
@@ -794,14 +1074,14 @@ public void Example_GetTextBlocklists_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTextBlocklists_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            await foreach (var item in client.GetTextBlocklistsAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetTextBlocklistsAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("blocklistName").ToString());
+                Console.WriteLine(result[0].GetProperty("blocklistName").ToString());
             }
         }
 
@@ -809,15 +1089,15 @@ public async Task Example_GetTextBlocklists_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTextBlocklists_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            await foreach (var item in client.GetTextBlocklistsAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetTextBlocklistsAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("blocklistName").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("blocklistName").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
             }
         }
 
@@ -825,11 +1105,24 @@ public async Task Example_GetTextBlocklists_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTextBlocklists_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            await foreach (TextBlocklist item in client.GetTextBlocklistsAsync())
+            {
+            }
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_GetTextBlocklists_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            await foreach (var item in client.GetTextBlocklistsAsync())
+            await foreach (TextBlocklist item in client.GetTextBlocklistsAsync())
             {
             }
         }
@@ -838,15 +1131,15 @@ public async Task Example_GetTextBlocklists_Convenience_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTextBlocklistItems()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            foreach (var item in client.GetTextBlocklistItems("<blocklistName>", 1234, 1234, 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetTextBlocklistItems("<blocklistName>", null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("blockItemId").ToString());
-                Console.WriteLine(result.GetProperty("text").ToString());
+                Console.WriteLine(result[0].GetProperty("blockItemId").ToString());
+                Console.WriteLine(result[0].GetProperty("text").ToString());
             }
         }
 
@@ -854,16 +1147,42 @@ public void Example_GetTextBlocklistItems()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTextBlocklistItems_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            foreach (var item in client.GetTextBlocklistItems("<blocklistName>", 1234, 1234, 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetTextBlocklistItems("<blocklistName>", 1234, 1234, 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("blockItemId").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("text").ToString());
+                Console.WriteLine(result[0].GetProperty("blockItemId").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("text").ToString());
+            }
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_GetTextBlocklistItems_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            foreach (TextBlockItem item in client.GetTextBlocklistItems("<blocklistName>"))
+            {
+            }
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_GetTextBlocklistItems_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            foreach (TextBlockItem item in client.GetTextBlocklistItems("<blocklistName>", maxCount: 1234, skip: 1234, maxpagesize: 1234))
+            {
             }
         }
 
@@ -871,15 +1190,15 @@ public void Example_GetTextBlocklistItems_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTextBlocklistItems_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            await foreach (var item in client.GetTextBlocklistItemsAsync("<blocklistName>", 1234, 1234, 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetTextBlocklistItemsAsync("<blocklistName>", null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("blockItemId").ToString());
-                Console.WriteLine(result.GetProperty("text").ToString());
+                Console.WriteLine(result[0].GetProperty("blockItemId").ToString());
+                Console.WriteLine(result[0].GetProperty("text").ToString());
             }
         }
 
@@ -887,16 +1206,16 @@ public async Task Example_GetTextBlocklistItems_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTextBlocklistItems_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            await foreach (var item in client.GetTextBlocklistItemsAsync("<blocklistName>", 1234, 1234, 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetTextBlocklistItemsAsync("<blocklistName>", 1234, 1234, 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("blockItemId").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("text").ToString());
+                Console.WriteLine(result[0].GetProperty("blockItemId").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("text").ToString());
             }
         }
 
@@ -904,11 +1223,24 @@ public async Task Example_GetTextBlocklistItems_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTextBlocklistItems_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ContentSafetyClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
+
+            await foreach (TextBlockItem item in client.GetTextBlocklistItemsAsync("<blocklistName>"))
+            {
+            }
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_GetTextBlocklistItems_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ContentSafetyClient client = new ContentSafetyClient(endpoint, credential);
 
-            await foreach (var item in client.GetTextBlocklistItemsAsync("<blocklistName>", 1234, 1234, 1234))
+            await foreach (TextBlockItem item in client.GetTextBlocklistItemsAsync("<blocklistName>", maxCount: 1234, skip: 1234, maxpagesize: 1234))
             {
             }
         }
diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevBoxesClient.xml b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevBoxesClient.xml
index d3a18ad5e79a..ccf11796cdff 100644
--- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevBoxesClient.xml
+++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevBoxesClient.xml
@@ -2,14 +2,25 @@
 <doc>
   <members>
     <member name="GetPoolAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetPoolAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPoolAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Response response = await client.GetPoolAsync("<poolName>", new RequestContext());
+Response response = await client.GetPoolAsync("<poolName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPoolAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Response response = await client.GetPoolAsync("<poolName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
@@ -26,18 +37,28 @@ Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSys
 Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
 Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
 Console.WriteLine(result.GetProperty("localAdministrator").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetPool(string,RequestContext)">
-<example>
-This sample shows how to call GetPool with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPool and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Response response = client.GetPool("<poolName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPool with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Response response = client.GetPool("<poolName>", new RequestContext());
+Response response = client.GetPool("<poolName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
@@ -54,18 +75,28 @@ Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSys
 Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
 Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
 Console.WriteLine(result.GetProperty("localAdministrator").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetScheduleByPoolAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetScheduleByPoolAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetScheduleByPoolAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Response response = await client.GetScheduleByPoolAsync("<poolName>", "<scheduleName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetScheduleByPoolAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Response response = await client.GetScheduleByPoolAsync("<poolName>", "<scheduleName>", new RequestContext());
+Response response = await client.GetScheduleByPoolAsync("<poolName>", "<scheduleName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
@@ -73,18 +104,28 @@ Console.WriteLine(result.GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("frequency").ToString());
 Console.WriteLine(result.GetProperty("time").ToString());
 Console.WriteLine(result.GetProperty("timeZone").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetScheduleByPool(string,string,RequestContext)">
-<example>
-This sample shows how to call GetScheduleByPool with required parameters and parse the result.
+      <example>
+This sample shows how to call GetScheduleByPool and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Response response = client.GetScheduleByPool("<poolName>", "<scheduleName>", new RequestContext());
+Response response = client.GetScheduleByPool("<poolName>", "<scheduleName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetScheduleByPool with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Response response = client.GetScheduleByPool("<poolName>", "<scheduleName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
@@ -92,18 +133,28 @@ Console.WriteLine(result.GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("frequency").ToString());
 Console.WriteLine(result.GetProperty("time").ToString());
 Console.WriteLine(result.GetProperty("timeZone").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDevBoxByUserAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDevBoxByUserAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDevBoxByUserAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Response response = await client.GetDevBoxByUserAsync("me", "<devBoxName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("poolName").ToString());
+]]></code>
+This sample shows how to call GetDevBoxByUserAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Response response = await client.GetDevBoxByUserAsync("<userId>", "<devBoxName>", new RequestContext());
+Response response = await client.GetDevBoxByUserAsync("me", "<devBoxName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
@@ -130,18 +181,28 @@ Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumbe
 Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
 Console.WriteLine(result.GetProperty("createdTime").ToString());
 Console.WriteLine(result.GetProperty("localAdministrator").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDevBoxByUser(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDevBoxByUser with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDevBoxByUser and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Response response = client.GetDevBoxByUser("<userId>", "<devBoxName>", new RequestContext());
+Response response = client.GetDevBoxByUser("me", "<devBoxName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("poolName").ToString());
+]]></code>
+This sample shows how to call GetDevBoxByUser with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Response response = client.GetDevBoxByUser("me", "<devBoxName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
@@ -168,50 +229,80 @@ Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumbe
 Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
 Console.WriteLine(result.GetProperty("createdTime").ToString());
 Console.WriteLine(result.GetProperty("localAdministrator").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRemoteConnectionAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetRemoteConnectionAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRemoteConnectionAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Response response = await client.GetRemoteConnectionAsync("me", "<devBoxName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetRemoteConnectionAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Response response = await client.GetRemoteConnectionAsync("<userId>", "<devBoxName>", new RequestContext());
+Response response = await client.GetRemoteConnectionAsync("me", "<devBoxName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("webUrl").ToString());
 Console.WriteLine(result.GetProperty("rdpConnectionUrl").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRemoteConnection(string,string,RequestContext)">
-<example>
-This sample shows how to call GetRemoteConnection with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRemoteConnection and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Response response = client.GetRemoteConnection("me", "<devBoxName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetRemoteConnection with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Response response = client.GetRemoteConnection("<userId>", "<devBoxName>", new RequestContext());
+Response response = client.GetRemoteConnection("me", "<devBoxName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("webUrl").ToString());
 Console.WriteLine(result.GetProperty("rdpConnectionUrl").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetUpcomingActionAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetUpcomingActionAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetUpcomingActionAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Response response = await client.GetUpcomingActionAsync("me", "<devBoxName>", "<upcomingActionId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetUpcomingActionAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Response response = await client.GetUpcomingActionAsync("<userId>", "<devBoxName>", "<upcomingActionId>", new RequestContext());
+Response response = await client.GetUpcomingActionAsync("me", "<devBoxName>", "<upcomingActionId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -220,18 +311,28 @@ Console.WriteLine(result.GetProperty("reason").ToString());
 Console.WriteLine(result.GetProperty("scheduledTime").ToString());
 Console.WriteLine(result.GetProperty("originalScheduledTime").ToString());
 Console.WriteLine(result.GetProperty("sourceId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetUpcomingAction(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetUpcomingAction with required parameters and parse the result.
+      <example>
+This sample shows how to call GetUpcomingAction and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Response response = client.GetUpcomingAction("<userId>", "<devBoxName>", "<upcomingActionId>", new RequestContext());
+Response response = client.GetUpcomingAction("me", "<devBoxName>", "<upcomingActionId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetUpcomingAction with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Response response = client.GetUpcomingAction("me", "<devBoxName>", "<upcomingActionId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -240,44 +341,70 @@ Console.WriteLine(result.GetProperty("reason").ToString());
 Console.WriteLine(result.GetProperty("scheduledTime").ToString());
 Console.WriteLine(result.GetProperty("originalScheduledTime").ToString());
 Console.WriteLine(result.GetProperty("sourceId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="SkipUpcomingActionAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call SkipUpcomingActionAsync with required parameters.
+      <example>
+This sample shows how to call SkipUpcomingActionAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Response response = await client.SkipUpcomingActionAsync("<userId>", "<devBoxName>", "<upcomingActionId>");
+Response response = await client.SkipUpcomingActionAsync("me", "<devBoxName>", "<upcomingActionId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call SkipUpcomingActionAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Response response = await client.SkipUpcomingActionAsync("me", "<devBoxName>", "<upcomingActionId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="SkipUpcomingAction(string,string,string,RequestContext)">
-<example>
-This sample shows how to call SkipUpcomingAction with required parameters.
+      <example>
+This sample shows how to call SkipUpcomingAction.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Response response = client.SkipUpcomingAction("<userId>", "<devBoxName>", "<upcomingActionId>");
+Response response = client.SkipUpcomingAction("me", "<devBoxName>", "<upcomingActionId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call SkipUpcomingAction with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Response response = client.SkipUpcomingAction("me", "<devBoxName>", "<upcomingActionId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DelayUpcomingActionAsync(string,string,string,DateTimeOffset,RequestContext)">
-<example>
-This sample shows how to call DelayUpcomingActionAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DelayUpcomingActionAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Response response = await client.DelayUpcomingActionAsync("<userId>", "<devBoxName>", "<upcomingActionId>", DateTimeOffset.UtcNow, new RequestContext());
+Response response = await client.DelayUpcomingActionAsync("me", "<devBoxName>", "<upcomingActionId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DelayUpcomingActionAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Response response = await client.DelayUpcomingActionAsync("me", "<devBoxName>", "<upcomingActionId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -286,18 +413,28 @@ Console.WriteLine(result.GetProperty("reason").ToString());
 Console.WriteLine(result.GetProperty("scheduledTime").ToString());
 Console.WriteLine(result.GetProperty("originalScheduledTime").ToString());
 Console.WriteLine(result.GetProperty("sourceId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DelayUpcomingAction(string,string,string,DateTimeOffset,RequestContext)">
-<example>
-This sample shows how to call DelayUpcomingAction with required parameters and parse the result.
+      <example>
+This sample shows how to call DelayUpcomingAction and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Response response = client.DelayUpcomingAction("me", "<devBoxName>", "<upcomingActionId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DelayUpcomingAction with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Response response = client.DelayUpcomingAction("<userId>", "<devBoxName>", "<upcomingActionId>", DateTimeOffset.UtcNow, new RequestContext());
+Response response = client.DelayUpcomingAction("me", "<devBoxName>", "<upcomingActionId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -306,259 +443,346 @@ Console.WriteLine(result.GetProperty("reason").ToString());
 Console.WriteLine(result.GetProperty("scheduledTime").ToString());
 Console.WriteLine(result.GetProperty("originalScheduledTime").ToString());
 Console.WriteLine(result.GetProperty("sourceId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetPoolsAsync(int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPoolsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPoolsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-await foreach (var item in client.GetPoolsAsync(1234, "<filter>", new RequestContext()))
+await foreach (BinaryData item in client.GetPoolsAsync(null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("location").ToString());
-    Console.WriteLine(result.GetProperty("osType").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-    Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-    Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-    Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPoolsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+await foreach (BinaryData item in client.GetPoolsAsync(1234, "<filter>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("location").ToString());
+    Console.WriteLine(result[0].GetProperty("osType").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+    Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+    Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+    Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetPools(int?,string,RequestContext)">
-<example>
-This sample shows how to call GetPools with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPools and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-foreach (var item in client.GetPools(1234, "<filter>", new RequestContext()))
+foreach (BinaryData item in client.GetPools(null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("location").ToString());
-    Console.WriteLine(result.GetProperty("osType").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-    Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-    Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-    Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetPools with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+foreach (BinaryData item in client.GetPools(1234, "<filter>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("location").ToString());
+    Console.WriteLine(result[0].GetProperty("osType").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+    Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+    Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+    Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSchedulesByPoolAsync(string,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSchedulesByPoolAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSchedulesByPoolAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-await foreach (var item in client.GetSchedulesByPoolAsync("<poolName>", 1234, "<filter>", new RequestContext()))
+await foreach (BinaryData item in client.GetSchedulesByPoolAsync("<poolName>", null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("frequency").ToString());
-    Console.WriteLine(result.GetProperty("time").ToString());
-    Console.WriteLine(result.GetProperty("timeZone").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSchedulesByPoolAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+await foreach (BinaryData item in client.GetSchedulesByPoolAsync("<poolName>", 1234, "<filter>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("frequency").ToString());
+    Console.WriteLine(result[0].GetProperty("time").ToString());
+    Console.WriteLine(result[0].GetProperty("timeZone").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSchedulesByPool(string,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetSchedulesByPool with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSchedulesByPool and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-foreach (var item in client.GetSchedulesByPool("<poolName>", 1234, "<filter>", new RequestContext()))
+foreach (BinaryData item in client.GetSchedulesByPool("<poolName>", null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("frequency").ToString());
-    Console.WriteLine(result.GetProperty("time").ToString());
-    Console.WriteLine(result.GetProperty("timeZone").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSchedulesByPool with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+foreach (BinaryData item in client.GetSchedulesByPool("<poolName>", 1234, "<filter>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("frequency").ToString());
+    Console.WriteLine(result[0].GetProperty("time").ToString());
+    Console.WriteLine(result[0].GetProperty("timeZone").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetDevBoxesByUserAsync(string,string,int?,RequestContext)">
-<example>
-This sample shows how to call GetDevBoxesByUserAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDevBoxesByUserAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-await foreach (var item in client.GetDevBoxesByUserAsync("<userId>", "<filter>", 1234, new RequestContext()))
+await foreach (BinaryData item in client.GetDevBoxesByUserAsync("me", null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("projectName").ToString());
-    Console.WriteLine(result.GetProperty("poolName").ToString());
-    Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-    Console.WriteLine(result.GetProperty("provisioningState").ToString());
-    Console.WriteLine(result.GetProperty("actionState").ToString());
-    Console.WriteLine(result.GetProperty("powerState").ToString());
-    Console.WriteLine(result.GetProperty("uniqueId").ToString());
-    Console.WriteLine(result.GetProperty("errorDetails").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("errorDetails").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("location").ToString());
-    Console.WriteLine(result.GetProperty("osType").ToString());
-    Console.WriteLine(result.GetProperty("user").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-    Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-    Console.WriteLine(result.GetProperty("createdTime").ToString());
-    Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+    Console.WriteLine(result[0].GetProperty("poolName").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetDevBoxesByUserAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+await foreach (BinaryData item in client.GetDevBoxesByUserAsync("me", "<filter>", 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("projectName").ToString());
+    Console.WriteLine(result[0].GetProperty("poolName").ToString());
+    Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+    Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+    Console.WriteLine(result[0].GetProperty("actionState").ToString());
+    Console.WriteLine(result[0].GetProperty("powerState").ToString());
+    Console.WriteLine(result[0].GetProperty("uniqueId").ToString());
+    Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("location").ToString());
+    Console.WriteLine(result[0].GetProperty("osType").ToString());
+    Console.WriteLine(result[0].GetProperty("user").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+    Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetDevBoxesByUser(string,string,int?,RequestContext)">
-<example>
-This sample shows how to call GetDevBoxesByUser with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDevBoxesByUser and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-foreach (var item in client.GetDevBoxesByUser("<userId>", "<filter>", 1234, new RequestContext()))
+foreach (BinaryData item in client.GetDevBoxesByUser("me", null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("projectName").ToString());
-    Console.WriteLine(result.GetProperty("poolName").ToString());
-    Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-    Console.WriteLine(result.GetProperty("provisioningState").ToString());
-    Console.WriteLine(result.GetProperty("actionState").ToString());
-    Console.WriteLine(result.GetProperty("powerState").ToString());
-    Console.WriteLine(result.GetProperty("uniqueId").ToString());
-    Console.WriteLine(result.GetProperty("errorDetails").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("errorDetails").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("location").ToString());
-    Console.WriteLine(result.GetProperty("osType").ToString());
-    Console.WriteLine(result.GetProperty("user").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-    Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-    Console.WriteLine(result.GetProperty("createdTime").ToString());
-    Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+    Console.WriteLine(result[0].GetProperty("poolName").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetDevBoxesByUser with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+foreach (BinaryData item in client.GetDevBoxesByUser("me", "<filter>", 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("projectName").ToString());
+    Console.WriteLine(result[0].GetProperty("poolName").ToString());
+    Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+    Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+    Console.WriteLine(result[0].GetProperty("actionState").ToString());
+    Console.WriteLine(result[0].GetProperty("powerState").ToString());
+    Console.WriteLine(result[0].GetProperty("uniqueId").ToString());
+    Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("location").ToString());
+    Console.WriteLine(result[0].GetProperty("osType").ToString());
+    Console.WriteLine(result[0].GetProperty("user").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+    Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetUpcomingActionsAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetUpcomingActionsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetUpcomingActionsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-await foreach (var item in client.GetUpcomingActionsAsync("<userId>", "<devBoxName>", new RequestContext()))
+await foreach (BinaryData item in client.GetUpcomingActionsAsync("me", "<devBoxName>", null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("actionType").ToString());
-    Console.WriteLine(result.GetProperty("reason").ToString());
-    Console.WriteLine(result.GetProperty("scheduledTime").ToString());
-    Console.WriteLine(result.GetProperty("originalScheduledTime").ToString());
-    Console.WriteLine(result.GetProperty("sourceId").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetUpcomingActionsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+await foreach (BinaryData item in client.GetUpcomingActionsAsync("me", "<devBoxName>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("actionType").ToString());
+    Console.WriteLine(result[0].GetProperty("reason").ToString());
+    Console.WriteLine(result[0].GetProperty("scheduledTime").ToString());
+    Console.WriteLine(result[0].GetProperty("originalScheduledTime").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceId").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetUpcomingActions(string,string,RequestContext)">
-<example>
-This sample shows how to call GetUpcomingActions with required parameters and parse the result.
+      <example>
+This sample shows how to call GetUpcomingActions and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-foreach (var item in client.GetUpcomingActions("<userId>", "<devBoxName>", new RequestContext()))
+foreach (BinaryData item in client.GetUpcomingActions("me", "<devBoxName>", null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("actionType").ToString());
-    Console.WriteLine(result.GetProperty("reason").ToString());
-    Console.WriteLine(result.GetProperty("scheduledTime").ToString());
-    Console.WriteLine(result.GetProperty("originalScheduledTime").ToString());
-    Console.WriteLine(result.GetProperty("sourceId").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetUpcomingActions with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+foreach (BinaryData item in client.GetUpcomingActions("me", "<devBoxName>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("actionType").ToString());
+    Console.WriteLine(result[0].GetProperty("reason").ToString());
+    Console.WriteLine(result[0].GetProperty("scheduledTime").ToString());
+    Console.WriteLine(result[0].GetProperty("originalScheduledTime").ToString());
+    Console.WriteLine(result[0].GetProperty("sourceId").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateDevBoxAsync(WaitUntil,string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateDevBoxAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateDevBoxAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    poolName = "<poolName>",
-};
-
-var operation = await client.CreateDevBoxAsync(WaitUntil.Completed, "<userId>", "<devBoxName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["poolName"] = "<poolName>",
+});
+Operation<BinaryData> operation = await client.CreateDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("poolName").ToString());
 ]]></code>
-This sample shows how to call CreateDevBoxAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateDevBoxAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    poolName = "<poolName>",
-    localAdministrator = "Enabled",
-};
-
-var operation = await client.CreateDevBoxAsync(WaitUntil.Completed, "<userId>", "<devBoxName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["poolName"] = "<poolName>",
+    ["localAdministrator"] = "Enabled",
+});
+Operation<BinaryData> operation = await client.CreateDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("projectName").ToString());
@@ -584,41 +808,40 @@ Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumbe
 Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
 Console.WriteLine(result.GetProperty("createdTime").ToString());
 Console.WriteLine(result.GetProperty("localAdministrator").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateDevBox(WaitUntil,string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateDevBox with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateDevBox and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    poolName = "<poolName>",
-};
-
-var operation = client.CreateDevBox(WaitUntil.Completed, "<userId>", "<devBoxName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["poolName"] = "<poolName>",
+});
+Operation<BinaryData> operation = client.CreateDevBox(WaitUntil.Completed, "me", "<devBoxName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("poolName").ToString());
 ]]></code>
-This sample shows how to call CreateDevBox with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateDevBox with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    poolName = "<poolName>",
-    localAdministrator = "Enabled",
-};
-
-var operation = client.CreateDevBox(WaitUntil.Completed, "<userId>", "<devBoxName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["poolName"] = "<poolName>",
+    ["localAdministrator"] = "Enabled",
+});
+Operation<BinaryData> operation = client.CreateDevBox(WaitUntil.Completed, "me", "<devBoxName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("projectName").ToString());
@@ -644,112 +867,121 @@ Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumbe
 Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
 Console.WriteLine(result.GetProperty("createdTime").ToString());
 Console.WriteLine(result.GetProperty("localAdministrator").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteDevBoxAsync(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteDevBoxAsync with required parameters.
+      <example>
+This sample shows how to call DeleteDevBoxAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-var operation = await client.DeleteDevBoxAsync(WaitUntil.Completed, "<userId>", "<devBoxName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = await client.DeleteDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>");
 ]]></code>
-</example>
+This sample shows how to call DeleteDevBoxAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Operation operation = await client.DeleteDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>");
+]]></code></example>
     </member>
     <member name="DeleteDevBox(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteDevBox with required parameters.
+      <example>
+This sample shows how to call DeleteDevBox.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-var operation = client.DeleteDevBox(WaitUntil.Completed, "<userId>", "<devBoxName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = client.DeleteDevBox(WaitUntil.Completed, "me", "<devBoxName>");
 ]]></code>
-</example>
+This sample shows how to call DeleteDevBox with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Operation operation = client.DeleteDevBox(WaitUntil.Completed, "me", "<devBoxName>");
+]]></code></example>
     </member>
     <member name="StartDevBoxAsync(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call StartDevBoxAsync with required parameters.
+      <example>
+This sample shows how to call StartDevBoxAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-var operation = await client.StartDevBoxAsync(WaitUntil.Completed, "<userId>", "<devBoxName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = await client.StartDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>");
 ]]></code>
-</example>
+This sample shows how to call StartDevBoxAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Operation operation = await client.StartDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>");
+]]></code></example>
     </member>
     <member name="StartDevBox(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call StartDevBox with required parameters.
+      <example>
+This sample shows how to call StartDevBox.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-var operation = client.StartDevBox(WaitUntil.Completed, "<userId>", "<devBoxName>");
-
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = client.StartDevBox(WaitUntil.Completed, "me", "<devBoxName>");
 ]]></code>
-</example>
+This sample shows how to call StartDevBox with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
+
+Operation operation = client.StartDevBox(WaitUntil.Completed, "me", "<devBoxName>");
+]]></code></example>
     </member>
     <member name="StopDevBoxAsync(WaitUntil,string,string,bool?,RequestContext)">
-<example>
-This sample shows how to call StopDevBoxAsync with required parameters.
+      <example>
+This sample shows how to call StopDevBoxAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-var operation = await client.StopDevBoxAsync(WaitUntil.Completed, "<userId>", "<devBoxName>");
-
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = await client.StopDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>");
 ]]></code>
 This sample shows how to call StopDevBoxAsync with all parameters.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-var operation = await client.StopDevBoxAsync(WaitUntil.Completed, "<userId>", "<devBoxName>", true);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
-]]></code>
-</example>
+Operation operation = await client.StopDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>", hibernate: true);
+]]></code></example>
     </member>
     <member name="StopDevBox(WaitUntil,string,string,bool?,RequestContext)">
-<example>
-This sample shows how to call StopDevBox with required parameters.
+      <example>
+This sample shows how to call StopDevBox.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-var operation = client.StopDevBox(WaitUntil.Completed, "<userId>", "<devBoxName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = client.StopDevBox(WaitUntil.Completed, "me", "<devBoxName>");
 ]]></code>
 This sample shows how to call StopDevBox with all parameters.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-var operation = client.StopDevBox(WaitUntil.Completed, "<userId>", "<devBoxName>", true);
-
-Console.WriteLine(operation.GetRawResponse().Status);
-]]></code>
-</example>
+Operation operation = client.StopDevBox(WaitUntil.Completed, "me", "<devBoxName>", hibernate: true);
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevCenterClient.xml b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevCenterClient.xml
index 7b289c99e95b..0fc56e0a4cd8 100644
--- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevCenterClient.xml
+++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/DevCenterClient.xml
@@ -2,226 +2,312 @@
 <doc>
   <members>
     <member name="GetProjectAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetProjectAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetProjectAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevCenterClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-Response response = await client.GetProjectAsync("<projectName>", new RequestContext());
+Response response = await client.GetProjectAsync("<projectName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetProjectAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
+
+Response response = await client.GetProjectAsync("<projectName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetProject(string,RequestContext)">
-<example>
-This sample shows how to call GetProject with required parameters and parse the result.
+      <example>
+This sample shows how to call GetProject and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
+
+Response response = client.GetProject("<projectName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetProject with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevCenterClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-Response response = client.GetProject("<projectName>", new RequestContext());
+Response response = client.GetProject("<projectName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetProjectsAsync(string,int?,RequestContext)">
-<example>
-This sample shows how to call GetProjectsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetProjectsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevCenterClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-await foreach (var item in client.GetProjectsAsync("<filter>", 1234, new RequestContext()))
+await foreach (BinaryData item in client.GetProjectsAsync(null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetProjectsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetProjectsAsync("<filter>", 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetProjects(string,int?,RequestContext)">
-<example>
-This sample shows how to call GetProjects with required parameters and parse the result.
+      <example>
+This sample shows how to call GetProjects and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevCenterClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-foreach (var item in client.GetProjects("<filter>", 1234, new RequestContext()))
+foreach (BinaryData item in client.GetProjects(null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetProjects with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetProjects("<filter>", 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllDevBoxesAsync(string,int?,RequestContext)">
-<example>
-This sample shows how to call GetAllDevBoxesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllDevBoxesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevCenterClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-await foreach (var item in client.GetAllDevBoxesAsync("<filter>", 1234, new RequestContext()))
+await foreach (BinaryData item in client.GetAllDevBoxesAsync(null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("projectName").ToString());
-    Console.WriteLine(result.GetProperty("poolName").ToString());
-    Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-    Console.WriteLine(result.GetProperty("provisioningState").ToString());
-    Console.WriteLine(result.GetProperty("actionState").ToString());
-    Console.WriteLine(result.GetProperty("powerState").ToString());
-    Console.WriteLine(result.GetProperty("uniqueId").ToString());
-    Console.WriteLine(result.GetProperty("errorDetails").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("errorDetails").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("location").ToString());
-    Console.WriteLine(result.GetProperty("osType").ToString());
-    Console.WriteLine(result.GetProperty("user").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-    Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-    Console.WriteLine(result.GetProperty("createdTime").ToString());
-    Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+    Console.WriteLine(result[0].GetProperty("poolName").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllDevBoxesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetAllDevBoxesAsync("<filter>", 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("projectName").ToString());
+    Console.WriteLine(result[0].GetProperty("poolName").ToString());
+    Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+    Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+    Console.WriteLine(result[0].GetProperty("actionState").ToString());
+    Console.WriteLine(result[0].GetProperty("powerState").ToString());
+    Console.WriteLine(result[0].GetProperty("uniqueId").ToString());
+    Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("location").ToString());
+    Console.WriteLine(result[0].GetProperty("osType").ToString());
+    Console.WriteLine(result[0].GetProperty("user").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+    Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllDevBoxes(string,int?,RequestContext)">
-<example>
-This sample shows how to call GetAllDevBoxes with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllDevBoxes and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevCenterClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-foreach (var item in client.GetAllDevBoxes("<filter>", 1234, new RequestContext()))
+foreach (BinaryData item in client.GetAllDevBoxes(null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("projectName").ToString());
-    Console.WriteLine(result.GetProperty("poolName").ToString());
-    Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-    Console.WriteLine(result.GetProperty("provisioningState").ToString());
-    Console.WriteLine(result.GetProperty("actionState").ToString());
-    Console.WriteLine(result.GetProperty("powerState").ToString());
-    Console.WriteLine(result.GetProperty("uniqueId").ToString());
-    Console.WriteLine(result.GetProperty("errorDetails").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("errorDetails").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("location").ToString());
-    Console.WriteLine(result.GetProperty("osType").ToString());
-    Console.WriteLine(result.GetProperty("user").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-    Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-    Console.WriteLine(result.GetProperty("createdTime").ToString());
-    Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+    Console.WriteLine(result[0].GetProperty("poolName").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllDevBoxes with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetAllDevBoxes("<filter>", 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("projectName").ToString());
+    Console.WriteLine(result[0].GetProperty("poolName").ToString());
+    Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+    Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+    Console.WriteLine(result[0].GetProperty("actionState").ToString());
+    Console.WriteLine(result[0].GetProperty("powerState").ToString());
+    Console.WriteLine(result[0].GetProperty("uniqueId").ToString());
+    Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("location").ToString());
+    Console.WriteLine(result[0].GetProperty("osType").ToString());
+    Console.WriteLine(result[0].GetProperty("user").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+    Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllDevBoxesByUserAsync(string,string,int?,RequestContext)">
-<example>
-This sample shows how to call GetAllDevBoxesByUserAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllDevBoxesByUserAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevCenterClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-await foreach (var item in client.GetAllDevBoxesByUserAsync("<userId>", "<filter>", 1234, new RequestContext()))
+await foreach (BinaryData item in client.GetAllDevBoxesByUserAsync("me", null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("projectName").ToString());
-    Console.WriteLine(result.GetProperty("poolName").ToString());
-    Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-    Console.WriteLine(result.GetProperty("provisioningState").ToString());
-    Console.WriteLine(result.GetProperty("actionState").ToString());
-    Console.WriteLine(result.GetProperty("powerState").ToString());
-    Console.WriteLine(result.GetProperty("uniqueId").ToString());
-    Console.WriteLine(result.GetProperty("errorDetails").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("errorDetails").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("location").ToString());
-    Console.WriteLine(result.GetProperty("osType").ToString());
-    Console.WriteLine(result.GetProperty("user").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-    Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-    Console.WriteLine(result.GetProperty("createdTime").ToString());
-    Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+    Console.WriteLine(result[0].GetProperty("poolName").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllDevBoxesByUserAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetAllDevBoxesByUserAsync("me", "<filter>", 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("projectName").ToString());
+    Console.WriteLine(result[0].GetProperty("poolName").ToString());
+    Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+    Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+    Console.WriteLine(result[0].GetProperty("actionState").ToString());
+    Console.WriteLine(result[0].GetProperty("powerState").ToString());
+    Console.WriteLine(result[0].GetProperty("uniqueId").ToString());
+    Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("location").ToString());
+    Console.WriteLine(result[0].GetProperty("osType").ToString());
+    Console.WriteLine(result[0].GetProperty("user").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+    Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllDevBoxesByUser(string,string,int?,RequestContext)">
-<example>
-This sample shows how to call GetAllDevBoxesByUser with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllDevBoxesByUser and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DevCenterClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-foreach (var item in client.GetAllDevBoxesByUser("<userId>", "<filter>", 1234, new RequestContext()))
+foreach (BinaryData item in client.GetAllDevBoxesByUser("me", null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("projectName").ToString());
-    Console.WriteLine(result.GetProperty("poolName").ToString());
-    Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-    Console.WriteLine(result.GetProperty("provisioningState").ToString());
-    Console.WriteLine(result.GetProperty("actionState").ToString());
-    Console.WriteLine(result.GetProperty("powerState").ToString());
-    Console.WriteLine(result.GetProperty("uniqueId").ToString());
-    Console.WriteLine(result.GetProperty("errorDetails").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("errorDetails").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("location").ToString());
-    Console.WriteLine(result.GetProperty("osType").ToString());
-    Console.WriteLine(result.GetProperty("user").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-    Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-    Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-    Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-    Console.WriteLine(result.GetProperty("createdTime").ToString());
-    Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+    Console.WriteLine(result[0].GetProperty("poolName").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllDevBoxesByUser with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DevCenterClient client = new DevCenterClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetAllDevBoxesByUser("me", "<filter>", 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("projectName").ToString());
+    Console.WriteLine(result[0].GetProperty("poolName").ToString());
+    Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+    Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+    Console.WriteLine(result[0].GetProperty("actionState").ToString());
+    Console.WriteLine(result[0].GetProperty("powerState").ToString());
+    Console.WriteLine(result[0].GetProperty("uniqueId").ToString());
+    Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("location").ToString());
+    Console.WriteLine(result[0].GetProperty("osType").ToString());
+    Console.WriteLine(result[0].GetProperty("user").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+    Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+    Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+    Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/EnvironmentsClient.xml b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/EnvironmentsClient.xml
index 01de740e6fb4..6d060714ae48 100644
--- a/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/EnvironmentsClient.xml
+++ b/sdk/devcenter/Azure.Developer.DevCenter/src/Generated/Docs/EnvironmentsClient.xml
@@ -2,14 +2,26 @@
 <doc>
   <members>
     <member name="GetEnvironmentByUserAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetEnvironmentByUserAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEnvironmentByUserAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-Response response = await client.GetEnvironmentByUserAsync("<userId>", "<environmentName>", new RequestContext());
+Response response = await client.GetEnvironmentByUserAsync("me", "<environmentName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("environmentType").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetEnvironmentByUserAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+Response response = await client.GetEnvironmentByUserAsync("me", "<environmentName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
@@ -21,22 +33,33 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("catalogName").ToString());
 Console.WriteLine(result.GetProperty("catalogItemName").ToString());
 Console.WriteLine(result.GetProperty("parameters").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetEnvironmentByUser(string,string,RequestContext)">
-<example>
-This sample shows how to call GetEnvironmentByUser with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEnvironmentByUser and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-Response response = client.GetEnvironmentByUser("<userId>", "<environmentName>", new RequestContext());
+Response response = client.GetEnvironmentByUser("me", "<environmentName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("environmentType").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetEnvironmentByUser with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+Response response = client.GetEnvironmentByUser("me", "<environmentName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
@@ -48,57 +71,54 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("catalogName").ToString());
 Console.WriteLine(result.GetProperty("catalogItemName").ToString());
 Console.WriteLine(result.GetProperty("parameters").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="UpdateEnvironmentAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateEnvironmentAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call UpdateEnvironmentAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-var data = new {
-    environmentType = "<environmentType>",
-};
-
-Response response = await client.UpdateEnvironmentAsync("<userId>", "<environmentName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.UpdateEnvironmentAsync("me", "<environmentName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("environmentType").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateEnvironmentAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    environmentType = "<environmentType>",
-    user = "<user>",
-    description = "<description>",
-    catalogName = "<catalogName>",
-    catalogItemName = "<catalogItemName>",
-    parameters = new {},
-    scheduledTasks = new {
-        key = new {
-            type = "AutoExpire",
-            enabled = "Enabled",
-            startTime = "2022-05-10T18:57:31.2311892Z",
+This sample shows how to call UpdateEnvironmentAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["description"] = "<description>",
+    ["catalogName"] = "<catalogName>",
+    ["catalogItemName"] = "<catalogItemName>",
+    ["parameters"] = new Dictionary<string, object>(),
+    ["scheduledTasks"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["type"] = "AutoExpire",
+            ["enabled"] = "Enabled",
+            ["startTime"] = "2022-05-10T18:57:31.2311892Z",
         },
     },
-    tags = new {
-        key = "<String>",
+    ["tags"] = new Dictionary<string, object>()
+    {
+        ["key"] = "<tags>",
     },
-};
-
-Response response = await client.UpdateEnvironmentAsync("<userId>", "<environmentName>", RequestContent.Create(data));
+});
+Response response = await client.UpdateEnvironmentAsync("me", "<environmentName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
@@ -110,57 +130,54 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("catalogName").ToString());
 Console.WriteLine(result.GetProperty("catalogItemName").ToString());
 Console.WriteLine(result.GetProperty("parameters").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="UpdateEnvironment(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateEnvironment with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call UpdateEnvironment and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    environmentType = "<environmentType>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-Response response = client.UpdateEnvironment("<userId>", "<environmentName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.UpdateEnvironment("me", "<environmentName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("environmentType").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateEnvironment with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    environmentType = "<environmentType>",
-    user = "<user>",
-    description = "<description>",
-    catalogName = "<catalogName>",
-    catalogItemName = "<catalogItemName>",
-    parameters = new {},
-    scheduledTasks = new {
-        key = new {
-            type = "AutoExpire",
-            enabled = "Enabled",
-            startTime = "2022-05-10T18:57:31.2311892Z",
+This sample shows how to call UpdateEnvironment with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["description"] = "<description>",
+    ["catalogName"] = "<catalogName>",
+    ["catalogItemName"] = "<catalogItemName>",
+    ["parameters"] = new Dictionary<string, object>(),
+    ["scheduledTasks"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["type"] = "AutoExpire",
+            ["enabled"] = "Enabled",
+            ["startTime"] = "2022-05-10T18:57:31.2311892Z",
         },
     },
-    tags = new {
-        key = "<String>",
+    ["tags"] = new Dictionary<string, object>()
+    {
+        ["key"] = "<tags>",
     },
-};
-
-Response response = client.UpdateEnvironment("<userId>", "<environmentName>", RequestContent.Create(data));
+});
+Response response = client.UpdateEnvironment("me", "<environmentName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
@@ -172,56 +189,86 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("catalogName").ToString());
 Console.WriteLine(result.GetProperty("catalogItemName").ToString());
 Console.WriteLine(result.GetProperty("parameters").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetCatalogItemAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCatalogItemAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCatalogItemAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+Response response = await client.GetCatalogItemAsync("<catalogItemId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCatalogItemAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-Response response = await client.GetCatalogItemAsync("<catalogItemId>", new RequestContext());
+Response response = await client.GetCatalogItemAsync("<catalogItemId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("catalogName").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCatalogItem(string,RequestContext)">
-<example>
-This sample shows how to call GetCatalogItem with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCatalogItem and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+Response response = client.GetCatalogItem("<catalogItemId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCatalogItem with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-Response response = client.GetCatalogItem("<catalogItemId>", new RequestContext());
+Response response = client.GetCatalogItem("<catalogItemId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("catalogName").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCatalogItemVersionAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetCatalogItemVersionAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCatalogItemVersionAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+Response response = await client.GetCatalogItemVersionAsync("<catalogItemId>", "<version>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCatalogItemVersionAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-Response response = await client.GetCatalogItemVersionAsync("<catalogItemId>", "<version>", new RequestContext());
+Response response = await client.GetCatalogItemVersionAsync("<catalogItemId>", "<version>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("catalogItemId").ToString());
@@ -258,18 +305,28 @@ Console.WriteLine(result.GetProperty("actions")[0].GetProperty("runner").ToStrin
 Console.WriteLine(result.GetProperty("runner").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("eligibleForLatestVersion").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCatalogItemVersion(string,string,RequestContext)">
-<example>
-This sample shows how to call GetCatalogItemVersion with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCatalogItemVersion and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+Response response = client.GetCatalogItemVersion("<catalogItemId>", "<version>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCatalogItemVersion with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-Response response = client.GetCatalogItemVersion("<catalogItemId>", "<version>", new RequestContext());
+Response response = client.GetCatalogItemVersion("<catalogItemId>", "<version>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("catalogItemId").ToString());
@@ -306,338 +363,454 @@ Console.WriteLine(result.GetProperty("actions")[0].GetProperty("runner").ToStrin
 Console.WriteLine(result.GetProperty("runner").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("eligibleForLatestVersion").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetEnvironmentsAsync(int?,RequestContext)">
-<example>
-This sample shows how to call GetEnvironmentsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEnvironmentsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-await foreach (var item in client.GetEnvironmentsAsync(1234, new RequestContext()))
+await foreach (BinaryData item in client.GetEnvironmentsAsync(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("environmentType").ToString());
-    Console.WriteLine(result.GetProperty("user").ToString());
-    Console.WriteLine(result.GetProperty("provisioningState").ToString());
-    Console.WriteLine(result.GetProperty("resourceGroupId").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("catalogName").ToString());
-    Console.WriteLine(result.GetProperty("catalogItemName").ToString());
-    Console.WriteLine(result.GetProperty("parameters").ToString());
-    Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-    Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-    Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetEnvironmentsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+await foreach (BinaryData item in client.GetEnvironmentsAsync(1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+    Console.WriteLine(result[0].GetProperty("user").ToString());
+    Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceGroupId").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("catalogName").ToString());
+    Console.WriteLine(result[0].GetProperty("catalogItemName").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters").ToString());
+    Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+    Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("tags").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetEnvironments(int?,RequestContext)">
-<example>
-This sample shows how to call GetEnvironments with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEnvironments and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-foreach (var item in client.GetEnvironments(1234, new RequestContext()))
+foreach (BinaryData item in client.GetEnvironments(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("environmentType").ToString());
-    Console.WriteLine(result.GetProperty("user").ToString());
-    Console.WriteLine(result.GetProperty("provisioningState").ToString());
-    Console.WriteLine(result.GetProperty("resourceGroupId").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("catalogName").ToString());
-    Console.WriteLine(result.GetProperty("catalogItemName").ToString());
-    Console.WriteLine(result.GetProperty("parameters").ToString());
-    Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-    Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-    Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetEnvironments with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+foreach (BinaryData item in client.GetEnvironments(1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+    Console.WriteLine(result[0].GetProperty("user").ToString());
+    Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceGroupId").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("catalogName").ToString());
+    Console.WriteLine(result[0].GetProperty("catalogItemName").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters").ToString());
+    Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+    Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("tags").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetEnvironmentsByUserAsync(string,int?,RequestContext)">
-<example>
-This sample shows how to call GetEnvironmentsByUserAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEnvironmentsByUserAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-await foreach (var item in client.GetEnvironmentsByUserAsync("<userId>", 1234, new RequestContext()))
+await foreach (BinaryData item in client.GetEnvironmentsByUserAsync("me", null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("environmentType").ToString());
-    Console.WriteLine(result.GetProperty("user").ToString());
-    Console.WriteLine(result.GetProperty("provisioningState").ToString());
-    Console.WriteLine(result.GetProperty("resourceGroupId").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("catalogName").ToString());
-    Console.WriteLine(result.GetProperty("catalogItemName").ToString());
-    Console.WriteLine(result.GetProperty("parameters").ToString());
-    Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-    Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-    Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetEnvironmentsByUserAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+await foreach (BinaryData item in client.GetEnvironmentsByUserAsync("me", 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+    Console.WriteLine(result[0].GetProperty("user").ToString());
+    Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceGroupId").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("catalogName").ToString());
+    Console.WriteLine(result[0].GetProperty("catalogItemName").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters").ToString());
+    Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+    Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("tags").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetEnvironmentsByUser(string,int?,RequestContext)">
-<example>
-This sample shows how to call GetEnvironmentsByUser with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEnvironmentsByUser and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-foreach (var item in client.GetEnvironmentsByUser("<userId>", 1234, new RequestContext()))
+foreach (BinaryData item in client.GetEnvironmentsByUser("me", null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("environmentType").ToString());
-    Console.WriteLine(result.GetProperty("user").ToString());
-    Console.WriteLine(result.GetProperty("provisioningState").ToString());
-    Console.WriteLine(result.GetProperty("resourceGroupId").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("catalogName").ToString());
-    Console.WriteLine(result.GetProperty("catalogItemName").ToString());
-    Console.WriteLine(result.GetProperty("parameters").ToString());
-    Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-    Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-    Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetEnvironmentsByUser with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+foreach (BinaryData item in client.GetEnvironmentsByUser("me", 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+    Console.WriteLine(result[0].GetProperty("user").ToString());
+    Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceGroupId").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("catalogName").ToString());
+    Console.WriteLine(result[0].GetProperty("catalogItemName").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters").ToString());
+    Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+    Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("tags").GetProperty("<key>").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetCatalogItemsAsync(int?,RequestContext)">
-<example>
-This sample shows how to call GetCatalogItemsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCatalogItemsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-await foreach (var item in client.GetCatalogItemsAsync(1234, new RequestContext()))
+await foreach (BinaryData item in client.GetCatalogItemsAsync(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("catalogName").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetCatalogItemsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+await foreach (BinaryData item in client.GetCatalogItemsAsync(1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("catalogName").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetCatalogItems(int?,RequestContext)">
-<example>
-This sample shows how to call GetCatalogItems with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCatalogItems and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-foreach (var item in client.GetCatalogItems(1234, new RequestContext()))
+foreach (BinaryData item in client.GetCatalogItems(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("catalogName").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetCatalogItems with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+foreach (BinaryData item in client.GetCatalogItems(1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("catalogName").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetCatalogItemVersionsAsync(string,int?,RequestContext)">
-<example>
-This sample shows how to call GetCatalogItemVersionsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCatalogItemVersionsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-await foreach (var item in client.GetCatalogItemVersionsAsync("<catalogItemId>", 1234, new RequestContext()))
+await foreach (BinaryData item in client.GetCatalogItemVersionsAsync("<catalogItemId>", null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("catalogItemId").ToString());
-    Console.WriteLine(result.GetProperty("catalogItemName").ToString());
-    Console.WriteLine(result.GetProperty("catalogName").ToString());
-    Console.WriteLine(result.GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("summary").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("templatePath").ToString());
-    Console.WriteLine(result.GetProperty("parametersSchema").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("default").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("readOnly").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("required").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parametersSchema").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("default").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("readOnly").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("required").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("typeName").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("runner").ToString());
-    Console.WriteLine(result.GetProperty("runner").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("eligibleForLatestVersion").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetCatalogItemVersionsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+await foreach (BinaryData item in client.GetCatalogItemVersionsAsync("<catalogItemId>", 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("catalogItemId").ToString());
+    Console.WriteLine(result[0].GetProperty("catalogItemName").ToString());
+    Console.WriteLine(result[0].GetProperty("catalogName").ToString());
+    Console.WriteLine(result[0].GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("summary").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("templatePath").ToString());
+    Console.WriteLine(result[0].GetProperty("parametersSchema").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("default").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("readOnly").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("required").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parametersSchema").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("default").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("readOnly").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("required").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("typeName").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("runner").ToString());
+    Console.WriteLine(result[0].GetProperty("runner").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("eligibleForLatestVersion").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetCatalogItemVersions(string,int?,RequestContext)">
-<example>
-This sample shows how to call GetCatalogItemVersions with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCatalogItemVersions and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-foreach (var item in client.GetCatalogItemVersions("<catalogItemId>", 1234, new RequestContext()))
+foreach (BinaryData item in client.GetCatalogItemVersions("<catalogItemId>", null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("catalogItemId").ToString());
-    Console.WriteLine(result.GetProperty("catalogItemName").ToString());
-    Console.WriteLine(result.GetProperty("catalogName").ToString());
-    Console.WriteLine(result.GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("summary").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("templatePath").ToString());
-    Console.WriteLine(result.GetProperty("parametersSchema").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("default").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("readOnly").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("required").ToString());
-    Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parametersSchema").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("default").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("readOnly").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("required").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("typeName").ToString());
-    Console.WriteLine(result.GetProperty("actions")[0].GetProperty("runner").ToString());
-    Console.WriteLine(result.GetProperty("runner").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("eligibleForLatestVersion").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetCatalogItemVersions with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+foreach (BinaryData item in client.GetCatalogItemVersions("<catalogItemId>", 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("catalogItemId").ToString());
+    Console.WriteLine(result[0].GetProperty("catalogItemName").ToString());
+    Console.WriteLine(result[0].GetProperty("catalogName").ToString());
+    Console.WriteLine(result[0].GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("summary").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("templatePath").ToString());
+    Console.WriteLine(result[0].GetProperty("parametersSchema").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("default").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("readOnly").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("required").ToString());
+    Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parametersSchema").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("default").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("readOnly").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("required").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("typeName").ToString());
+    Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("runner").ToString());
+    Console.WriteLine(result[0].GetProperty("runner").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("eligibleForLatestVersion").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetEnvironmentTypesAsync(int?,RequestContext)">
-<example>
-This sample shows how to call GetEnvironmentTypesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEnvironmentTypesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-await foreach (var item in client.GetEnvironmentTypesAsync(1234, new RequestContext()))
+await foreach (BinaryData item in client.GetEnvironmentTypesAsync(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("deploymentTargetId").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetEnvironmentTypesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+await foreach (BinaryData item in client.GetEnvironmentTypesAsync(1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentTargetId").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetEnvironmentTypes(int?,RequestContext)">
-<example>
-This sample shows how to call GetEnvironmentTypes with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEnvironmentTypes and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-foreach (var item in client.GetEnvironmentTypes(1234, new RequestContext()))
+foreach (BinaryData item in client.GetEnvironmentTypes(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("deploymentTargetId").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetEnvironmentTypes with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+foreach (BinaryData item in client.GetEnvironmentTypes(1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentTargetId").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateOrUpdateEnvironmentAsync(WaitUntil,string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateEnvironmentAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateEnvironmentAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    environmentType = "<environmentType>",
-};
-
-var operation = await client.CreateOrUpdateEnvironmentAsync(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["environmentType"] = "<environmentType>",
+});
+Operation<BinaryData> operation = await client.CreateOrUpdateEnvironmentAsync(WaitUntil.Completed, "me", "<environmentName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("environmentType").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateEnvironmentAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    environmentType = "<environmentType>",
-    user = "<user>",
-    description = "<description>",
-    catalogName = "<catalogName>",
-    catalogItemName = "<catalogItemName>",
-    parameters = new {},
-    scheduledTasks = new {
-        key = new {
-            type = "AutoExpire",
-            enabled = "Enabled",
-            startTime = "2022-05-10T18:57:31.2311892Z",
+This sample shows how to call CreateOrUpdateEnvironmentAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["environmentType"] = "<environmentType>",
+    ["user"] = "<user>",
+    ["description"] = "<description>",
+    ["catalogName"] = "<catalogName>",
+    ["catalogItemName"] = "<catalogItemName>",
+    ["parameters"] = new Dictionary<string, object>(),
+    ["scheduledTasks"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["type"] = "AutoExpire",
+            ["enabled"] = "Enabled",
+            ["startTime"] = "2022-05-10T18:57:31.2311892Z",
         },
     },
-    tags = new {
-        key = "<String>",
+    ["tags"] = new Dictionary<string, object>()
+    {
+        ["key"] = "<tags>",
     },
-};
-
-var operation = await client.CreateOrUpdateEnvironmentAsync(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = await client.CreateOrUpdateEnvironmentAsync(WaitUntil.Completed, "me", "<environmentName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("environmentType").ToString());
@@ -648,60 +821,62 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("catalogName").ToString());
 Console.WriteLine(result.GetProperty("catalogItemName").ToString());
 Console.WriteLine(result.GetProperty("parameters").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateEnvironment(WaitUntil,string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateEnvironment with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateEnvironment and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    environmentType = "<environmentType>",
-};
-
-var operation = client.CreateOrUpdateEnvironment(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["environmentType"] = "<environmentType>",
+});
+Operation<BinaryData> operation = client.CreateOrUpdateEnvironment(WaitUntil.Completed, "me", "<environmentName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("environmentType").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateEnvironment with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    environmentType = "<environmentType>",
-    user = "<user>",
-    description = "<description>",
-    catalogName = "<catalogName>",
-    catalogItemName = "<catalogItemName>",
-    parameters = new {},
-    scheduledTasks = new {
-        key = new {
-            type = "AutoExpire",
-            enabled = "Enabled",
-            startTime = "2022-05-10T18:57:31.2311892Z",
+This sample shows how to call CreateOrUpdateEnvironment with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["environmentType"] = "<environmentType>",
+    ["user"] = "<user>",
+    ["description"] = "<description>",
+    ["catalogName"] = "<catalogName>",
+    ["catalogItemName"] = "<catalogItemName>",
+    ["parameters"] = new Dictionary<string, object>(),
+    ["scheduledTasks"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["type"] = "AutoExpire",
+            ["enabled"] = "Enabled",
+            ["startTime"] = "2022-05-10T18:57:31.2311892Z",
         },
     },
-    tags = new {
-        key = "<String>",
+    ["tags"] = new Dictionary<string, object>()
+    {
+        ["key"] = "<tags>",
     },
-};
-
-var operation = client.CreateOrUpdateEnvironment(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = client.CreateOrUpdateEnvironment(WaitUntil.Completed, "me", "<environmentName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("environmentType").ToString());
@@ -712,172 +887,161 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("catalogName").ToString());
 Console.WriteLine(result.GetProperty("catalogItemName").ToString());
 Console.WriteLine(result.GetProperty("parameters").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="DeleteEnvironmentAsync(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteEnvironmentAsync with required parameters.
+      <example>
+This sample shows how to call DeleteEnvironmentAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var operation = await client.DeleteEnvironmentAsync(WaitUntil.Completed, "<userId>", "<environmentName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = await client.DeleteEnvironmentAsync(WaitUntil.Completed, "me", "<environmentName>");
 ]]></code>
-</example>
+This sample shows how to call DeleteEnvironmentAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+Operation operation = await client.DeleteEnvironmentAsync(WaitUntil.Completed, "me", "<environmentName>");
+]]></code></example>
     </member>
     <member name="DeleteEnvironment(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteEnvironment with required parameters.
+      <example>
+This sample shows how to call DeleteEnvironment.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var operation = client.DeleteEnvironment(WaitUntil.Completed, "<userId>", "<environmentName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = client.DeleteEnvironment(WaitUntil.Completed, "me", "<environmentName>");
 ]]></code>
-</example>
+This sample shows how to call DeleteEnvironment with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
+
+Operation operation = client.DeleteEnvironment(WaitUntil.Completed, "me", "<environmentName>");
+]]></code></example>
     </member>
     <member name="DeployEnvironmentActionAsync(WaitUntil,string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DeployEnvironmentActionAsync with required parameters and request content.
+      <example>
+This sample shows how to call DeployEnvironmentActionAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    actionId = "<actionId>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-var operation = await client.DeployEnvironmentActionAsync(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
-Console.WriteLine(operation.GetRawResponse().Status);
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["actionId"] = "<actionId>",
+});
+Operation operation = await client.DeployEnvironmentActionAsync(WaitUntil.Completed, "me", "<environmentName>", content);
 ]]></code>
 This sample shows how to call DeployEnvironmentActionAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-var data = new {
-    actionId = "<actionId>",
-    parameters = new {},
-};
-
-var operation = await client.DeployEnvironmentActionAsync(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
-Console.WriteLine(operation.GetRawResponse().Status);
-]]></code>
-</example>
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["actionId"] = "<actionId>",
+    ["parameters"] = new Dictionary<string, object>(),
+});
+Operation operation = await client.DeployEnvironmentActionAsync(WaitUntil.Completed, "me", "<environmentName>", content);
+]]></code></example>
     </member>
     <member name="DeployEnvironmentAction(WaitUntil,string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DeployEnvironmentAction with required parameters and request content.
+      <example>
+This sample shows how to call DeployEnvironmentAction.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    actionId = "<actionId>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-var operation = client.DeployEnvironmentAction(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
-Console.WriteLine(operation.GetRawResponse().Status);
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["actionId"] = "<actionId>",
+});
+Operation operation = client.DeployEnvironmentAction(WaitUntil.Completed, "me", "<environmentName>", content);
 ]]></code>
 This sample shows how to call DeployEnvironmentAction with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    actionId = "<actionId>",
-    parameters = new {},
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-var operation = client.DeployEnvironmentAction(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
-Console.WriteLine(operation.GetRawResponse().Status);
-]]></code>
-</example>
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["actionId"] = "<actionId>",
+    ["parameters"] = new Dictionary<string, object>(),
+});
+Operation operation = client.DeployEnvironmentAction(WaitUntil.Completed, "me", "<environmentName>", content);
+]]></code></example>
     </member>
     <member name="CustomEnvironmentActionAsync(WaitUntil,string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CustomEnvironmentActionAsync with required parameters and request content.
+      <example>
+This sample shows how to call CustomEnvironmentActionAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    actionId = "<actionId>",
-};
-
-var operation = await client.CustomEnvironmentActionAsync(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["actionId"] = "<actionId>",
+});
+Operation operation = await client.CustomEnvironmentActionAsync(WaitUntil.Completed, "me", "<environmentName>", content);
 ]]></code>
 This sample shows how to call CustomEnvironmentActionAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    actionId = "<actionId>",
-    parameters = new {},
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-var operation = await client.CustomEnvironmentActionAsync(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
-Console.WriteLine(operation.GetRawResponse().Status);
-]]></code>
-</example>
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["actionId"] = "<actionId>",
+    ["parameters"] = new Dictionary<string, object>(),
+});
+Operation operation = await client.CustomEnvironmentActionAsync(WaitUntil.Completed, "me", "<environmentName>", content);
+]]></code></example>
     </member>
     <member name="CustomEnvironmentAction(WaitUntil,string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CustomEnvironmentAction with required parameters and request content.
+      <example>
+This sample shows how to call CustomEnvironmentAction.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    actionId = "<actionId>",
-};
-
-var operation = client.CustomEnvironmentAction(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["actionId"] = "<actionId>",
+});
+Operation operation = client.CustomEnvironmentAction(WaitUntil.Completed, "me", "<environmentName>", content);
 ]]></code>
 This sample shows how to call CustomEnvironmentAction with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-var data = new {
-    actionId = "<actionId>",
-    parameters = new {},
-};
-
-var operation = client.CustomEnvironmentAction(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
-]]></code>
-</example>
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["actionId"] = "<actionId>",
+    ["parameters"] = new Dictionary<string, object>(),
+});
+Operation operation = client.CustomEnvironmentAction(WaitUntil.Completed, "me", "<environmentName>", content);
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevBoxesClient.cs b/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevBoxesClient.cs
index 35caff7366fc..2c0541b7eb4c 100644
--- a/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevBoxesClient.cs
+++ b/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevBoxesClient.cs
@@ -7,11 +7,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
+using Azure.Developer.DevCenter;
 using Azure.Identity;
 using NUnit.Framework;
 
@@ -23,11 +23,11 @@ public class Samples_DevBoxesClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPool()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetPool("<poolName>", new RequestContext());
+            Response response = client.GetPool("<poolName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -37,11 +37,11 @@ public void Example_GetPool()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPool_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetPool("<poolName>", new RequestContext());
+            Response response = client.GetPool("<poolName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -64,11 +64,11 @@ public void Example_GetPool_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPool_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetPoolAsync("<poolName>", new RequestContext());
+            Response response = await client.GetPoolAsync("<poolName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -78,11 +78,11 @@ public async Task Example_GetPool_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPool_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetPoolAsync("<poolName>", new RequestContext());
+            Response response = await client.GetPoolAsync("<poolName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -105,11 +105,11 @@ public async Task Example_GetPool_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetScheduleByPool()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetScheduleByPool("<poolName>", "<scheduleName>", new RequestContext());
+            Response response = client.GetScheduleByPool("<poolName>", "<scheduleName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -119,11 +119,11 @@ public void Example_GetScheduleByPool()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetScheduleByPool_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetScheduleByPool("<poolName>", "<scheduleName>", new RequestContext());
+            Response response = client.GetScheduleByPool("<poolName>", "<scheduleName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -137,11 +137,11 @@ public void Example_GetScheduleByPool_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetScheduleByPool_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetScheduleByPoolAsync("<poolName>", "<scheduleName>", new RequestContext());
+            Response response = await client.GetScheduleByPoolAsync("<poolName>", "<scheduleName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -151,11 +151,11 @@ public async Task Example_GetScheduleByPool_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetScheduleByPool_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetScheduleByPoolAsync("<poolName>", "<scheduleName>", new RequestContext());
+            Response response = await client.GetScheduleByPoolAsync("<poolName>", "<scheduleName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -169,11 +169,11 @@ public async Task Example_GetScheduleByPool_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDevBoxByUser()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetDevBoxByUser("<userId>", "<devBoxName>", new RequestContext());
+            Response response = client.GetDevBoxByUser("me", "<devBoxName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("poolName").ToString());
@@ -183,11 +183,11 @@ public void Example_GetDevBoxByUser()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDevBoxByUser_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetDevBoxByUser("<userId>", "<devBoxName>", new RequestContext());
+            Response response = client.GetDevBoxByUser("me", "<devBoxName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -220,11 +220,11 @@ public void Example_GetDevBoxByUser_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDevBoxByUser_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetDevBoxByUserAsync("<userId>", "<devBoxName>", new RequestContext());
+            Response response = await client.GetDevBoxByUserAsync("me", "<devBoxName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("poolName").ToString());
@@ -234,11 +234,11 @@ public async Task Example_GetDevBoxByUser_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDevBoxByUser_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetDevBoxByUserAsync("<userId>", "<devBoxName>", new RequestContext());
+            Response response = await client.GetDevBoxByUserAsync("me", "<devBoxName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -271,11 +271,11 @@ public async Task Example_GetDevBoxByUser_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRemoteConnection()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetRemoteConnection("<userId>", "<devBoxName>", new RequestContext());
+            Response response = client.GetRemoteConnection("me", "<devBoxName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -285,11 +285,11 @@ public void Example_GetRemoteConnection()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRemoteConnection_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetRemoteConnection("<userId>", "<devBoxName>", new RequestContext());
+            Response response = client.GetRemoteConnection("me", "<devBoxName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("webUrl").ToString());
@@ -300,11 +300,11 @@ public void Example_GetRemoteConnection_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRemoteConnection_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetRemoteConnectionAsync("<userId>", "<devBoxName>", new RequestContext());
+            Response response = await client.GetRemoteConnectionAsync("me", "<devBoxName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -314,11 +314,11 @@ public async Task Example_GetRemoteConnection_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRemoteConnection_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetRemoteConnectionAsync("<userId>", "<devBoxName>", new RequestContext());
+            Response response = await client.GetRemoteConnectionAsync("me", "<devBoxName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("webUrl").ToString());
@@ -329,11 +329,11 @@ public async Task Example_GetRemoteConnection_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpcomingAction()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetUpcomingAction("<userId>", "<devBoxName>", "<upcomingActionId>", new RequestContext());
+            Response response = client.GetUpcomingAction("me", "<devBoxName>", "<upcomingActionId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -343,11 +343,11 @@ public void Example_GetUpcomingAction()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpcomingAction_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetUpcomingAction("<userId>", "<devBoxName>", "<upcomingActionId>", new RequestContext());
+            Response response = client.GetUpcomingAction("me", "<devBoxName>", "<upcomingActionId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -362,11 +362,11 @@ public void Example_GetUpcomingAction_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpcomingAction_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetUpcomingActionAsync("<userId>", "<devBoxName>", "<upcomingActionId>", new RequestContext());
+            Response response = await client.GetUpcomingActionAsync("me", "<devBoxName>", "<upcomingActionId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -376,11 +376,11 @@ public async Task Example_GetUpcomingAction_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpcomingAction_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetUpcomingActionAsync("<userId>", "<devBoxName>", "<upcomingActionId>", new RequestContext());
+            Response response = await client.GetUpcomingActionAsync("me", "<devBoxName>", "<upcomingActionId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -395,11 +395,11 @@ public async Task Example_GetUpcomingAction_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_SkipUpcomingAction()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.SkipUpcomingAction("<userId>", "<devBoxName>", "<upcomingActionId>");
+            Response response = client.SkipUpcomingAction("me", "<devBoxName>", "<upcomingActionId>");
             Console.WriteLine(response.Status);
         }
 
@@ -407,11 +407,11 @@ public void Example_SkipUpcomingAction()
         [Ignore("Only validating compilation of examples")]
         public void Example_SkipUpcomingAction_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.SkipUpcomingAction("<userId>", "<devBoxName>", "<upcomingActionId>");
+            Response response = client.SkipUpcomingAction("me", "<devBoxName>", "<upcomingActionId>");
             Console.WriteLine(response.Status);
         }
 
@@ -419,11 +419,11 @@ public void Example_SkipUpcomingAction_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SkipUpcomingAction_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.SkipUpcomingActionAsync("<userId>", "<devBoxName>", "<upcomingActionId>");
+            Response response = await client.SkipUpcomingActionAsync("me", "<devBoxName>", "<upcomingActionId>");
             Console.WriteLine(response.Status);
         }
 
@@ -431,11 +431,11 @@ public async Task Example_SkipUpcomingAction_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SkipUpcomingAction_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.SkipUpcomingActionAsync("<userId>", "<devBoxName>", "<upcomingActionId>");
+            Response response = await client.SkipUpcomingActionAsync("me", "<devBoxName>", "<upcomingActionId>");
             Console.WriteLine(response.Status);
         }
 
@@ -443,11 +443,11 @@ public async Task Example_SkipUpcomingAction_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DelayUpcomingAction()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.DelayUpcomingAction("<userId>", "<devBoxName>", "<upcomingActionId>", DateTimeOffset.UtcNow, new RequestContext());
+            Response response = client.DelayUpcomingAction("me", "<devBoxName>", "<upcomingActionId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -457,11 +457,11 @@ public void Example_DelayUpcomingAction()
         [Ignore("Only validating compilation of examples")]
         public void Example_DelayUpcomingAction_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.DelayUpcomingAction("<userId>", "<devBoxName>", "<upcomingActionId>", DateTimeOffset.UtcNow, new RequestContext());
+            Response response = client.DelayUpcomingAction("me", "<devBoxName>", "<upcomingActionId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -476,11 +476,11 @@ public void Example_DelayUpcomingAction_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DelayUpcomingAction_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.DelayUpcomingActionAsync("<userId>", "<devBoxName>", "<upcomingActionId>", DateTimeOffset.UtcNow, new RequestContext());
+            Response response = await client.DelayUpcomingActionAsync("me", "<devBoxName>", "<upcomingActionId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -490,11 +490,11 @@ public async Task Example_DelayUpcomingAction_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DelayUpcomingAction_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.DelayUpcomingActionAsync("<userId>", "<devBoxName>", "<upcomingActionId>", DateTimeOffset.UtcNow, new RequestContext());
+            Response response = await client.DelayUpcomingActionAsync("me", "<devBoxName>", "<upcomingActionId>", DateTimeOffset.Parse("2022-05-10T18:57:31.2311892Z"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -509,14 +509,14 @@ public async Task Example_DelayUpcomingAction_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPools()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetPools(1234, "<filter>", new RequestContext()))
+            foreach (BinaryData item in client.GetPools(null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -524,27 +524,27 @@ public void Example_GetPools()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPools_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetPools(1234, "<filter>", new RequestContext()))
+            foreach (BinaryData item in client.GetPools(1234, "<filter>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("location").ToString());
-                Console.WriteLine(result.GetProperty("osType").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-                Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-                Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-                Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("location").ToString());
+                Console.WriteLine(result[0].GetProperty("osType").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+                Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+                Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+                Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
             }
         }
 
@@ -552,14 +552,14 @@ public void Example_GetPools_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPools_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetPoolsAsync(1234, "<filter>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPoolsAsync(null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -567,27 +567,27 @@ public async Task Example_GetPools_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPools_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetPoolsAsync(1234, "<filter>", new RequestContext()))
+            await foreach (BinaryData item in client.GetPoolsAsync(1234, "<filter>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("location").ToString());
-                Console.WriteLine(result.GetProperty("osType").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-                Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-                Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-                Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("location").ToString());
+                Console.WriteLine(result[0].GetProperty("osType").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+                Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+                Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+                Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
             }
         }
 
@@ -595,14 +595,14 @@ public async Task Example_GetPools_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSchedulesByPool()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetSchedulesByPool("<poolName>", 1234, "<filter>", new RequestContext()))
+            foreach (BinaryData item in client.GetSchedulesByPool("<poolName>", null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -610,18 +610,18 @@ public void Example_GetSchedulesByPool()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSchedulesByPool_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetSchedulesByPool("<poolName>", 1234, "<filter>", new RequestContext()))
+            foreach (BinaryData item in client.GetSchedulesByPool("<poolName>", 1234, "<filter>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("frequency").ToString());
-                Console.WriteLine(result.GetProperty("time").ToString());
-                Console.WriteLine(result.GetProperty("timeZone").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("frequency").ToString());
+                Console.WriteLine(result[0].GetProperty("time").ToString());
+                Console.WriteLine(result[0].GetProperty("timeZone").ToString());
             }
         }
 
@@ -629,14 +629,14 @@ public void Example_GetSchedulesByPool_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSchedulesByPool_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetSchedulesByPoolAsync("<poolName>", 1234, "<filter>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSchedulesByPoolAsync("<poolName>", null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -644,18 +644,18 @@ public async Task Example_GetSchedulesByPool_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSchedulesByPool_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetSchedulesByPoolAsync("<poolName>", 1234, "<filter>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSchedulesByPoolAsync("<poolName>", 1234, "<filter>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("frequency").ToString());
-                Console.WriteLine(result.GetProperty("time").ToString());
-                Console.WriteLine(result.GetProperty("timeZone").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("frequency").ToString());
+                Console.WriteLine(result[0].GetProperty("time").ToString());
+                Console.WriteLine(result[0].GetProperty("timeZone").ToString());
             }
         }
 
@@ -663,14 +663,14 @@ public async Task Example_GetSchedulesByPool_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDevBoxesByUser()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetDevBoxesByUser("<userId>", "<filter>", 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetDevBoxesByUser("me", null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("poolName").ToString());
+                Console.WriteLine(result[0].GetProperty("poolName").ToString());
             }
         }
 
@@ -678,37 +678,37 @@ public void Example_GetDevBoxesByUser()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDevBoxesByUser_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetDevBoxesByUser("<userId>", "<filter>", 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetDevBoxesByUser("me", "<filter>", 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("projectName").ToString());
-                Console.WriteLine(result.GetProperty("poolName").ToString());
-                Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-                Console.WriteLine(result.GetProperty("provisioningState").ToString());
-                Console.WriteLine(result.GetProperty("actionState").ToString());
-                Console.WriteLine(result.GetProperty("powerState").ToString());
-                Console.WriteLine(result.GetProperty("uniqueId").ToString());
-                Console.WriteLine(result.GetProperty("errorDetails").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("errorDetails").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("location").ToString());
-                Console.WriteLine(result.GetProperty("osType").ToString());
-                Console.WriteLine(result.GetProperty("user").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-                Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("projectName").ToString());
+                Console.WriteLine(result[0].GetProperty("poolName").ToString());
+                Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+                Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+                Console.WriteLine(result[0].GetProperty("actionState").ToString());
+                Console.WriteLine(result[0].GetProperty("powerState").ToString());
+                Console.WriteLine(result[0].GetProperty("uniqueId").ToString());
+                Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("location").ToString());
+                Console.WriteLine(result[0].GetProperty("osType").ToString());
+                Console.WriteLine(result[0].GetProperty("user").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+                Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
             }
         }
 
@@ -716,14 +716,14 @@ public void Example_GetDevBoxesByUser_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDevBoxesByUser_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetDevBoxesByUserAsync("<userId>", "<filter>", 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetDevBoxesByUserAsync("me", null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("poolName").ToString());
+                Console.WriteLine(result[0].GetProperty("poolName").ToString());
             }
         }
 
@@ -731,37 +731,37 @@ public async Task Example_GetDevBoxesByUser_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDevBoxesByUser_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetDevBoxesByUserAsync("<userId>", "<filter>", 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetDevBoxesByUserAsync("me", "<filter>", 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("projectName").ToString());
-                Console.WriteLine(result.GetProperty("poolName").ToString());
-                Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-                Console.WriteLine(result.GetProperty("provisioningState").ToString());
-                Console.WriteLine(result.GetProperty("actionState").ToString());
-                Console.WriteLine(result.GetProperty("powerState").ToString());
-                Console.WriteLine(result.GetProperty("uniqueId").ToString());
-                Console.WriteLine(result.GetProperty("errorDetails").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("errorDetails").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("location").ToString());
-                Console.WriteLine(result.GetProperty("osType").ToString());
-                Console.WriteLine(result.GetProperty("user").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-                Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("projectName").ToString());
+                Console.WriteLine(result[0].GetProperty("poolName").ToString());
+                Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+                Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+                Console.WriteLine(result[0].GetProperty("actionState").ToString());
+                Console.WriteLine(result[0].GetProperty("powerState").ToString());
+                Console.WriteLine(result[0].GetProperty("uniqueId").ToString());
+                Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("location").ToString());
+                Console.WriteLine(result[0].GetProperty("osType").ToString());
+                Console.WriteLine(result[0].GetProperty("user").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+                Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
             }
         }
 
@@ -769,14 +769,14 @@ public async Task Example_GetDevBoxesByUser_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpcomingActions()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetUpcomingActions("<userId>", "<devBoxName>", new RequestContext()))
+            foreach (BinaryData item in client.GetUpcomingActions("me", "<devBoxName>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -784,19 +784,19 @@ public void Example_GetUpcomingActions()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpcomingActions_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetUpcomingActions("<userId>", "<devBoxName>", new RequestContext()))
+            foreach (BinaryData item in client.GetUpcomingActions("me", "<devBoxName>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("actionType").ToString());
-                Console.WriteLine(result.GetProperty("reason").ToString());
-                Console.WriteLine(result.GetProperty("scheduledTime").ToString());
-                Console.WriteLine(result.GetProperty("originalScheduledTime").ToString());
-                Console.WriteLine(result.GetProperty("sourceId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("actionType").ToString());
+                Console.WriteLine(result[0].GetProperty("reason").ToString());
+                Console.WriteLine(result[0].GetProperty("scheduledTime").ToString());
+                Console.WriteLine(result[0].GetProperty("originalScheduledTime").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceId").ToString());
             }
         }
 
@@ -804,14 +804,14 @@ public void Example_GetUpcomingActions_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpcomingActions_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetUpcomingActionsAsync("<userId>", "<devBoxName>", new RequestContext()))
+            await foreach (BinaryData item in client.GetUpcomingActionsAsync("me", "<devBoxName>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -819,19 +819,19 @@ public async Task Example_GetUpcomingActions_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpcomingActions_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetUpcomingActionsAsync("<userId>", "<devBoxName>", new RequestContext()))
+            await foreach (BinaryData item in client.GetUpcomingActionsAsync("me", "<devBoxName>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("actionType").ToString());
-                Console.WriteLine(result.GetProperty("reason").ToString());
-                Console.WriteLine(result.GetProperty("scheduledTime").ToString());
-                Console.WriteLine(result.GetProperty("originalScheduledTime").ToString());
-                Console.WriteLine(result.GetProperty("sourceId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("actionType").ToString());
+                Console.WriteLine(result[0].GetProperty("reason").ToString());
+                Console.WriteLine(result[0].GetProperty("scheduledTime").ToString());
+                Console.WriteLine(result[0].GetProperty("originalScheduledTime").ToString());
+                Console.WriteLine(result[0].GetProperty("sourceId").ToString());
             }
         }
 
@@ -839,18 +839,17 @@ public async Task Example_GetUpcomingActions_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateDevBox()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                poolName = "<poolName>",
-            };
-
-            var operation = client.CreateDevBox(WaitUntil.Completed, "<userId>", "<devBoxName>", RequestContent.Create(data));
-
+                ["poolName"] = "<poolName>",
+            });
+            Operation<BinaryData> operation = client.CreateDevBox(WaitUntil.Completed, "me", "<devBoxName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("poolName").ToString());
         }
@@ -859,19 +858,18 @@ public void Example_CreateDevBox()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateDevBox_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                poolName = "<poolName>",
-                localAdministrator = "Enabled",
-            };
-
-            var operation = client.CreateDevBox(WaitUntil.Completed, "<userId>", "<devBoxName>", RequestContent.Create(data));
-
+                ["poolName"] = "<poolName>",
+                ["localAdministrator"] = "Enabled",
+            });
+            Operation<BinaryData> operation = client.CreateDevBox(WaitUntil.Completed, "me", "<devBoxName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
             Console.WriteLine(result.GetProperty("projectName").ToString());
@@ -903,18 +901,17 @@ public void Example_CreateDevBox_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateDevBox_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                poolName = "<poolName>",
-            };
-
-            var operation = await client.CreateDevBoxAsync(WaitUntil.Completed, "<userId>", "<devBoxName>", RequestContent.Create(data));
-
+                ["poolName"] = "<poolName>",
+            });
+            Operation<BinaryData> operation = await client.CreateDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("poolName").ToString());
         }
@@ -923,19 +920,18 @@ public async Task Example_CreateDevBox_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateDevBox_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                poolName = "<poolName>",
-                localAdministrator = "Enabled",
-            };
-
-            var operation = await client.CreateDevBoxAsync(WaitUntil.Completed, "<userId>", "<devBoxName>", RequestContent.Create(data));
-
+                ["poolName"] = "<poolName>",
+                ["localAdministrator"] = "Enabled",
+            });
+            Operation<BinaryData> operation = await client.CreateDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
             Console.WriteLine(result.GetProperty("projectName").ToString());
@@ -967,156 +963,132 @@ public async Task Example_CreateDevBox_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteDevBox()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            var operation = client.DeleteDevBox(WaitUntil.Completed, "<userId>", "<devBoxName>");
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.DeleteDevBox(WaitUntil.Completed, "me", "<devBoxName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteDevBox_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-            var operation = client.DeleteDevBox(WaitUntil.Completed, "<userId>", "<devBoxName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.DeleteDevBox(WaitUntil.Completed, "me", "<devBoxName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteDevBox_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-            var operation = await client.DeleteDevBoxAsync(WaitUntil.Completed, "<userId>", "<devBoxName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.DeleteDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteDevBox_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            var operation = await client.DeleteDevBoxAsync(WaitUntil.Completed, "<userId>", "<devBoxName>");
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.DeleteDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_StartDevBox()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-            var operation = client.StartDevBox(WaitUntil.Completed, "<userId>", "<devBoxName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.StartDevBox(WaitUntil.Completed, "me", "<devBoxName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_StartDevBox_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-            var operation = client.StartDevBox(WaitUntil.Completed, "<userId>", "<devBoxName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.StartDevBox(WaitUntil.Completed, "me", "<devBoxName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_StartDevBox_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            var operation = await client.StartDevBoxAsync(WaitUntil.Completed, "<userId>", "<devBoxName>");
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.StartDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_StartDevBox_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-            var operation = await client.StartDevBoxAsync(WaitUntil.Completed, "<userId>", "<devBoxName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.StartDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_StopDevBox()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-            var operation = client.StopDevBox(WaitUntil.Completed, "<userId>", "<devBoxName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.StopDevBox(WaitUntil.Completed, "me", "<devBoxName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_StopDevBox_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            var operation = client.StopDevBox(WaitUntil.Completed, "<userId>", "<devBoxName>", true);
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.StopDevBox(WaitUntil.Completed, "me", "<devBoxName>", hibernate: true);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_StopDevBox_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-            var operation = await client.StopDevBoxAsync(WaitUntil.Completed, "<userId>", "<devBoxName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.StopDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_StopDevBox_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevBoxesClient(endpoint, "<projectName>", credential);
-
-            var operation = await client.StopDevBoxAsync(WaitUntil.Completed, "<userId>", "<devBoxName>", true);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevBoxesClient client = new DevBoxesClient(endpoint, "<ProjectName>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.StopDevBoxAsync(WaitUntil.Completed, "me", "<devBoxName>", hibernate: true);
         }
     }
 }
diff --git a/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevCenterClient.cs b/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevCenterClient.cs
index ba9e73bb21b4..f0174744be39 100644
--- a/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevCenterClient.cs
+++ b/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_DevCenterClient.cs
@@ -6,12 +6,11 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
+using Azure.Developer.DevCenter;
 using Azure.Identity;
 using NUnit.Framework;
 
@@ -23,11 +22,11 @@ public class Samples_DevCenterClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProject()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            Response response = client.GetProject("<projectName>", new RequestContext());
+            Response response = client.GetProject("<projectName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -37,11 +36,11 @@ public void Example_GetProject()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProject_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            Response response = client.GetProject("<projectName>", new RequestContext());
+            Response response = client.GetProject("<projectName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -52,11 +51,11 @@ public void Example_GetProject_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProject_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            Response response = await client.GetProjectAsync("<projectName>", new RequestContext());
+            Response response = await client.GetProjectAsync("<projectName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -66,11 +65,11 @@ public async Task Example_GetProject_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProject_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            Response response = await client.GetProjectAsync("<projectName>", new RequestContext());
+            Response response = await client.GetProjectAsync("<projectName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -81,14 +80,14 @@ public async Task Example_GetProject_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProjects()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            foreach (var item in client.GetProjects("<filter>", 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetProjects(null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -96,15 +95,15 @@ public void Example_GetProjects()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProjects_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            foreach (var item in client.GetProjects("<filter>", 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetProjects("<filter>", 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
             }
         }
 
@@ -112,14 +111,14 @@ public void Example_GetProjects_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProjects_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            await foreach (var item in client.GetProjectsAsync("<filter>", 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetProjectsAsync(null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -127,15 +126,15 @@ public async Task Example_GetProjects_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProjects_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            await foreach (var item in client.GetProjectsAsync("<filter>", 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetProjectsAsync("<filter>", 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
             }
         }
 
@@ -143,14 +142,14 @@ public async Task Example_GetProjects_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllDevBoxes()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            foreach (var item in client.GetAllDevBoxes("<filter>", 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetAllDevBoxes(null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("poolName").ToString());
+                Console.WriteLine(result[0].GetProperty("poolName").ToString());
             }
         }
 
@@ -158,37 +157,37 @@ public void Example_GetAllDevBoxes()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllDevBoxes_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            foreach (var item in client.GetAllDevBoxes("<filter>", 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetAllDevBoxes("<filter>", 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("projectName").ToString());
-                Console.WriteLine(result.GetProperty("poolName").ToString());
-                Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-                Console.WriteLine(result.GetProperty("provisioningState").ToString());
-                Console.WriteLine(result.GetProperty("actionState").ToString());
-                Console.WriteLine(result.GetProperty("powerState").ToString());
-                Console.WriteLine(result.GetProperty("uniqueId").ToString());
-                Console.WriteLine(result.GetProperty("errorDetails").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("errorDetails").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("location").ToString());
-                Console.WriteLine(result.GetProperty("osType").ToString());
-                Console.WriteLine(result.GetProperty("user").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-                Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("projectName").ToString());
+                Console.WriteLine(result[0].GetProperty("poolName").ToString());
+                Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+                Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+                Console.WriteLine(result[0].GetProperty("actionState").ToString());
+                Console.WriteLine(result[0].GetProperty("powerState").ToString());
+                Console.WriteLine(result[0].GetProperty("uniqueId").ToString());
+                Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("location").ToString());
+                Console.WriteLine(result[0].GetProperty("osType").ToString());
+                Console.WriteLine(result[0].GetProperty("user").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+                Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
             }
         }
 
@@ -196,14 +195,14 @@ public void Example_GetAllDevBoxes_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllDevBoxes_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            await foreach (var item in client.GetAllDevBoxesAsync("<filter>", 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetAllDevBoxesAsync(null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("poolName").ToString());
+                Console.WriteLine(result[0].GetProperty("poolName").ToString());
             }
         }
 
@@ -211,37 +210,37 @@ public async Task Example_GetAllDevBoxes_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllDevBoxes_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            await foreach (var item in client.GetAllDevBoxesAsync("<filter>", 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetAllDevBoxesAsync("<filter>", 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("projectName").ToString());
-                Console.WriteLine(result.GetProperty("poolName").ToString());
-                Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-                Console.WriteLine(result.GetProperty("provisioningState").ToString());
-                Console.WriteLine(result.GetProperty("actionState").ToString());
-                Console.WriteLine(result.GetProperty("powerState").ToString());
-                Console.WriteLine(result.GetProperty("uniqueId").ToString());
-                Console.WriteLine(result.GetProperty("errorDetails").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("errorDetails").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("location").ToString());
-                Console.WriteLine(result.GetProperty("osType").ToString());
-                Console.WriteLine(result.GetProperty("user").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-                Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("projectName").ToString());
+                Console.WriteLine(result[0].GetProperty("poolName").ToString());
+                Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+                Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+                Console.WriteLine(result[0].GetProperty("actionState").ToString());
+                Console.WriteLine(result[0].GetProperty("powerState").ToString());
+                Console.WriteLine(result[0].GetProperty("uniqueId").ToString());
+                Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("location").ToString());
+                Console.WriteLine(result[0].GetProperty("osType").ToString());
+                Console.WriteLine(result[0].GetProperty("user").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+                Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
             }
         }
 
@@ -249,14 +248,14 @@ public async Task Example_GetAllDevBoxes_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllDevBoxesByUser()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            foreach (var item in client.GetAllDevBoxesByUser("<userId>", "<filter>", 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetAllDevBoxesByUser("me", null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("poolName").ToString());
+                Console.WriteLine(result[0].GetProperty("poolName").ToString());
             }
         }
 
@@ -264,37 +263,37 @@ public void Example_GetAllDevBoxesByUser()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllDevBoxesByUser_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            foreach (var item in client.GetAllDevBoxesByUser("<userId>", "<filter>", 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetAllDevBoxesByUser("me", "<filter>", 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("projectName").ToString());
-                Console.WriteLine(result.GetProperty("poolName").ToString());
-                Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-                Console.WriteLine(result.GetProperty("provisioningState").ToString());
-                Console.WriteLine(result.GetProperty("actionState").ToString());
-                Console.WriteLine(result.GetProperty("powerState").ToString());
-                Console.WriteLine(result.GetProperty("uniqueId").ToString());
-                Console.WriteLine(result.GetProperty("errorDetails").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("errorDetails").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("location").ToString());
-                Console.WriteLine(result.GetProperty("osType").ToString());
-                Console.WriteLine(result.GetProperty("user").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-                Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("projectName").ToString());
+                Console.WriteLine(result[0].GetProperty("poolName").ToString());
+                Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+                Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+                Console.WriteLine(result[0].GetProperty("actionState").ToString());
+                Console.WriteLine(result[0].GetProperty("powerState").ToString());
+                Console.WriteLine(result[0].GetProperty("uniqueId").ToString());
+                Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("location").ToString());
+                Console.WriteLine(result[0].GetProperty("osType").ToString());
+                Console.WriteLine(result[0].GetProperty("user").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+                Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
             }
         }
 
@@ -302,14 +301,14 @@ public void Example_GetAllDevBoxesByUser_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllDevBoxesByUser_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            await foreach (var item in client.GetAllDevBoxesByUserAsync("<userId>", "<filter>", 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetAllDevBoxesByUserAsync("me", null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("poolName").ToString());
+                Console.WriteLine(result[0].GetProperty("poolName").ToString());
             }
         }
 
@@ -317,37 +316,37 @@ public async Task Example_GetAllDevBoxesByUser_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllDevBoxesByUser_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DevCenterClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DevCenterClient client = new DevCenterClient(endpoint, credential);
 
-            await foreach (var item in client.GetAllDevBoxesByUserAsync("<userId>", "<filter>", 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetAllDevBoxesByUserAsync("me", "<filter>", 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("projectName").ToString());
-                Console.WriteLine(result.GetProperty("poolName").ToString());
-                Console.WriteLine(result.GetProperty("hibernateSupport").ToString());
-                Console.WriteLine(result.GetProperty("provisioningState").ToString());
-                Console.WriteLine(result.GetProperty("actionState").ToString());
-                Console.WriteLine(result.GetProperty("powerState").ToString());
-                Console.WriteLine(result.GetProperty("uniqueId").ToString());
-                Console.WriteLine(result.GetProperty("errorDetails").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("errorDetails").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("location").ToString());
-                Console.WriteLine(result.GetProperty("osType").ToString());
-                Console.WriteLine(result.GetProperty("user").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("skuName").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
-                Console.WriteLine(result.GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
-                Console.WriteLine(result.GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("operatingSystem").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
-                Console.WriteLine(result.GetProperty("imageReference").GetProperty("publishedDate").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("localAdministrator").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("projectName").ToString());
+                Console.WriteLine(result[0].GetProperty("poolName").ToString());
+                Console.WriteLine(result[0].GetProperty("hibernateSupport").ToString());
+                Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+                Console.WriteLine(result[0].GetProperty("actionState").ToString());
+                Console.WriteLine(result[0].GetProperty("powerState").ToString());
+                Console.WriteLine(result[0].GetProperty("uniqueId").ToString());
+                Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("errorDetails").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("location").ToString());
+                Console.WriteLine(result[0].GetProperty("osType").ToString());
+                Console.WriteLine(result[0].GetProperty("user").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("skuName").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("vCPUs").ToString());
+                Console.WriteLine(result[0].GetProperty("hardwareProfile").GetProperty("memoryGB").ToString());
+                Console.WriteLine(result[0].GetProperty("storageProfile").GetProperty("osDisk").GetProperty("diskSizeGB").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("operatingSystem").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("osBuildNumber").ToString());
+                Console.WriteLine(result[0].GetProperty("imageReference").GetProperty("publishedDate").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("localAdministrator").ToString());
             }
         }
     }
diff --git a/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_EnvironmentsClient.cs b/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_EnvironmentsClient.cs
index 4c9a107a2af2..1b9ebbb0bf7c 100644
--- a/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_EnvironmentsClient.cs
+++ b/sdk/devcenter/Azure.Developer.DevCenter/tests/Generated/Samples/Samples_EnvironmentsClient.cs
@@ -7,11 +7,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
+using Azure.Developer.DevCenter;
 using Azure.Identity;
 using NUnit.Framework;
 
@@ -23,11 +23,11 @@ public class Samples_EnvironmentsClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEnvironmentByUser()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetEnvironmentByUser("<userId>", "<environmentName>", new RequestContext());
+            Response response = client.GetEnvironmentByUser("me", "<environmentName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("environmentType").ToString());
@@ -38,11 +38,11 @@ public void Example_GetEnvironmentByUser()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEnvironmentByUser_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetEnvironmentByUser("<userId>", "<environmentName>", new RequestContext());
+            Response response = client.GetEnvironmentByUser("me", "<environmentName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -54,21 +54,21 @@ public void Example_GetEnvironmentByUser_AllParameters()
             Console.WriteLine(result.GetProperty("catalogName").ToString());
             Console.WriteLine(result.GetProperty("catalogItemName").ToString());
             Console.WriteLine(result.GetProperty("parameters").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEnvironmentByUser_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetEnvironmentByUserAsync("<userId>", "<environmentName>", new RequestContext());
+            Response response = await client.GetEnvironmentByUserAsync("me", "<environmentName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("environmentType").ToString());
@@ -79,11 +79,11 @@ public async Task Example_GetEnvironmentByUser_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEnvironmentByUser_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetEnvironmentByUserAsync("<userId>", "<environmentName>", new RequestContext());
+            Response response = await client.GetEnvironmentByUserAsync("me", "<environmentName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -95,26 +95,22 @@ public async Task Example_GetEnvironmentByUser_AllParameters_Async()
             Console.WriteLine(result.GetProperty("catalogName").ToString());
             Console.WriteLine(result.GetProperty("catalogItemName").ToString());
             Console.WriteLine(result.GetProperty("parameters").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateEnvironment()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
-            {
-                environmentType = "<environmentType>",
-            };
-
-            Response response = client.UpdateEnvironment("<userId>", "<environmentName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.UpdateEnvironment("me", "<environmentName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("environmentType").ToString());
@@ -125,34 +121,31 @@ public void Example_UpdateEnvironment()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateEnvironment_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                environmentType = "<environmentType>",
-                user = "<user>",
-                description = "<description>",
-                catalogName = "<catalogName>",
-                catalogItemName = "<catalogItemName>",
-                parameters = new { },
-                scheduledTasks = new
+                ["description"] = "<description>",
+                ["catalogName"] = "<catalogName>",
+                ["catalogItemName"] = "<catalogItemName>",
+                ["parameters"] = new Dictionary<string, object>(),
+                ["scheduledTasks"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        type = "AutoExpire",
-                        enabled = "Enabled",
-                        startTime = "2022-05-10T18:57:31.2311892Z",
+                        ["type"] = "AutoExpire",
+                        ["enabled"] = "Enabled",
+                        ["startTime"] = "2022-05-10T18:57:31.2311892Z",
                     },
                 },
-                tags = new
+                ["tags"] = new Dictionary<string, object>()
                 {
-                    key = "<String>",
+                    ["key"] = "<tags>",
                 },
-            };
-
-            Response response = client.UpdateEnvironment("<userId>", "<environmentName>", RequestContent.Create(data));
+            });
+            Response response = client.UpdateEnvironment("me", "<environmentName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -164,26 +157,22 @@ public void Example_UpdateEnvironment_AllParameters()
             Console.WriteLine(result.GetProperty("catalogName").ToString());
             Console.WriteLine(result.GetProperty("catalogItemName").ToString());
             Console.WriteLine(result.GetProperty("parameters").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateEnvironment_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-            var data = new
-            {
-                environmentType = "<environmentType>",
-            };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.UpdateEnvironmentAsync("<userId>", "<environmentName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.UpdateEnvironmentAsync("me", "<environmentName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("environmentType").ToString());
@@ -194,34 +183,31 @@ public async Task Example_UpdateEnvironment_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateEnvironment_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                environmentType = "<environmentType>",
-                user = "<user>",
-                description = "<description>",
-                catalogName = "<catalogName>",
-                catalogItemName = "<catalogItemName>",
-                parameters = new { },
-                scheduledTasks = new
+                ["description"] = "<description>",
+                ["catalogName"] = "<catalogName>",
+                ["catalogItemName"] = "<catalogItemName>",
+                ["parameters"] = new Dictionary<string, object>(),
+                ["scheduledTasks"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        type = "AutoExpire",
-                        enabled = "Enabled",
-                        startTime = "2022-05-10T18:57:31.2311892Z",
+                        ["type"] = "AutoExpire",
+                        ["enabled"] = "Enabled",
+                        ["startTime"] = "2022-05-10T18:57:31.2311892Z",
                     },
                 },
-                tags = new
+                ["tags"] = new Dictionary<string, object>()
                 {
-                    key = "<String>",
+                    ["key"] = "<tags>",
                 },
-            };
-
-            Response response = await client.UpdateEnvironmentAsync("<userId>", "<environmentName>", RequestContent.Create(data));
+            });
+            Response response = await client.UpdateEnvironmentAsync("me", "<environmentName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -233,21 +219,21 @@ public async Task Example_UpdateEnvironment_AllParameters_Async()
             Console.WriteLine(result.GetProperty("catalogName").ToString());
             Console.WriteLine(result.GetProperty("catalogItemName").ToString());
             Console.WriteLine(result.GetProperty("parameters").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCatalogItem()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetCatalogItem("<catalogItemId>", new RequestContext());
+            Response response = client.GetCatalogItem("<catalogItemId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -257,11 +243,11 @@ public void Example_GetCatalogItem()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCatalogItem_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetCatalogItem("<catalogItemId>", new RequestContext());
+            Response response = client.GetCatalogItem("<catalogItemId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -273,11 +259,11 @@ public void Example_GetCatalogItem_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCatalogItem_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetCatalogItemAsync("<catalogItemId>", new RequestContext());
+            Response response = await client.GetCatalogItemAsync("<catalogItemId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -287,11 +273,11 @@ public async Task Example_GetCatalogItem_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCatalogItem_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetCatalogItemAsync("<catalogItemId>", new RequestContext());
+            Response response = await client.GetCatalogItemAsync("<catalogItemId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -303,11 +289,11 @@ public async Task Example_GetCatalogItem_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCatalogItemVersion()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetCatalogItemVersion("<catalogItemId>", "<version>", new RequestContext());
+            Response response = client.GetCatalogItemVersion("<catalogItemId>", "<version>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -317,11 +303,11 @@ public void Example_GetCatalogItemVersion()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCatalogItemVersion_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Response response = client.GetCatalogItemVersion("<catalogItemId>", "<version>", new RequestContext());
+            Response response = client.GetCatalogItemVersion("<catalogItemId>", "<version>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("catalogItemId").ToString());
@@ -364,11 +350,11 @@ public void Example_GetCatalogItemVersion_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCatalogItemVersion_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetCatalogItemVersionAsync("<catalogItemId>", "<version>", new RequestContext());
+            Response response = await client.GetCatalogItemVersionAsync("<catalogItemId>", "<version>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -378,11 +364,11 @@ public async Task Example_GetCatalogItemVersion_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCatalogItemVersion_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Response response = await client.GetCatalogItemVersionAsync("<catalogItemId>", "<version>", new RequestContext());
+            Response response = await client.GetCatalogItemVersionAsync("<catalogItemId>", "<version>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("catalogItemId").ToString());
@@ -425,15 +411,15 @@ public async Task Example_GetCatalogItemVersion_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEnvironments()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetEnvironments(1234, new RequestContext()))
+            foreach (BinaryData item in client.GetEnvironments(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("environmentType").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -441,26 +427,26 @@ public void Example_GetEnvironments()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEnvironments_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetEnvironments(1234, new RequestContext()))
+            foreach (BinaryData item in client.GetEnvironments(1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("environmentType").ToString());
-                Console.WriteLine(result.GetProperty("user").ToString());
-                Console.WriteLine(result.GetProperty("provisioningState").ToString());
-                Console.WriteLine(result.GetProperty("resourceGroupId").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("catalogName").ToString());
-                Console.WriteLine(result.GetProperty("catalogItemName").ToString());
-                Console.WriteLine(result.GetProperty("parameters").ToString());
-                Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-                Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+                Console.WriteLine(result[0].GetProperty("user").ToString());
+                Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceGroupId").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogName").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogItemName").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters").ToString());
+                Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+                Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("tags").GetProperty("<key>").ToString());
             }
         }
 
@@ -468,15 +454,15 @@ public void Example_GetEnvironments_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEnvironments_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetEnvironmentsAsync(1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetEnvironmentsAsync(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("environmentType").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -484,26 +470,26 @@ public async Task Example_GetEnvironments_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEnvironments_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetEnvironmentsAsync(1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetEnvironmentsAsync(1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("environmentType").ToString());
-                Console.WriteLine(result.GetProperty("user").ToString());
-                Console.WriteLine(result.GetProperty("provisioningState").ToString());
-                Console.WriteLine(result.GetProperty("resourceGroupId").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("catalogName").ToString());
-                Console.WriteLine(result.GetProperty("catalogItemName").ToString());
-                Console.WriteLine(result.GetProperty("parameters").ToString());
-                Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-                Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+                Console.WriteLine(result[0].GetProperty("user").ToString());
+                Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceGroupId").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogName").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogItemName").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters").ToString());
+                Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+                Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("tags").GetProperty("<key>").ToString());
             }
         }
 
@@ -511,15 +497,15 @@ public async Task Example_GetEnvironments_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEnvironmentsByUser()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetEnvironmentsByUser("<userId>", 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetEnvironmentsByUser("me", null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("environmentType").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -527,26 +513,26 @@ public void Example_GetEnvironmentsByUser()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEnvironmentsByUser_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetEnvironmentsByUser("<userId>", 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetEnvironmentsByUser("me", 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("environmentType").ToString());
-                Console.WriteLine(result.GetProperty("user").ToString());
-                Console.WriteLine(result.GetProperty("provisioningState").ToString());
-                Console.WriteLine(result.GetProperty("resourceGroupId").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("catalogName").ToString());
-                Console.WriteLine(result.GetProperty("catalogItemName").ToString());
-                Console.WriteLine(result.GetProperty("parameters").ToString());
-                Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-                Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+                Console.WriteLine(result[0].GetProperty("user").ToString());
+                Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceGroupId").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogName").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogItemName").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters").ToString());
+                Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+                Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("tags").GetProperty("<key>").ToString());
             }
         }
 
@@ -554,15 +540,15 @@ public void Example_GetEnvironmentsByUser_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEnvironmentsByUser_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetEnvironmentsByUserAsync("<userId>", 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetEnvironmentsByUserAsync("me", null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("environmentType").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -570,26 +556,26 @@ public async Task Example_GetEnvironmentsByUser_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEnvironmentsByUser_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetEnvironmentsByUserAsync("<userId>", 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetEnvironmentsByUserAsync("me", 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("environmentType").ToString());
-                Console.WriteLine(result.GetProperty("user").ToString());
-                Console.WriteLine(result.GetProperty("provisioningState").ToString());
-                Console.WriteLine(result.GetProperty("resourceGroupId").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("catalogName").ToString());
-                Console.WriteLine(result.GetProperty("catalogItemName").ToString());
-                Console.WriteLine(result.GetProperty("parameters").ToString());
-                Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-                Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("environmentType").ToString());
+                Console.WriteLine(result[0].GetProperty("user").ToString());
+                Console.WriteLine(result[0].GetProperty("provisioningState").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceGroupId").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogName").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogItemName").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters").ToString());
+                Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+                Console.WriteLine(result[0].GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("tags").GetProperty("<key>").ToString());
             }
         }
 
@@ -597,14 +583,14 @@ public async Task Example_GetEnvironmentsByUser_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCatalogItems()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetCatalogItems(1234, new RequestContext()))
+            foreach (BinaryData item in client.GetCatalogItems(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -612,16 +598,16 @@ public void Example_GetCatalogItems()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCatalogItems_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetCatalogItems(1234, new RequestContext()))
+            foreach (BinaryData item in client.GetCatalogItems(1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("catalogName").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogName").ToString());
             }
         }
 
@@ -629,14 +615,14 @@ public void Example_GetCatalogItems_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCatalogItems_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetCatalogItemsAsync(1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetCatalogItemsAsync(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -644,16 +630,16 @@ public async Task Example_GetCatalogItems_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCatalogItems_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetCatalogItemsAsync(1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetCatalogItemsAsync(1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("catalogName").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogName").ToString());
             }
         }
 
@@ -661,14 +647,14 @@ public async Task Example_GetCatalogItems_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCatalogItemVersions()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetCatalogItemVersions("<catalogItemId>", 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetCatalogItemVersions("<catalogItemId>", null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -676,47 +662,47 @@ public void Example_GetCatalogItemVersions()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCatalogItemVersions_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetCatalogItemVersions("<catalogItemId>", 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetCatalogItemVersions("<catalogItemId>", 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("catalogItemId").ToString());
-                Console.WriteLine(result.GetProperty("catalogItemName").ToString());
-                Console.WriteLine(result.GetProperty("catalogName").ToString());
-                Console.WriteLine(result.GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("summary").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("templatePath").ToString());
-                Console.WriteLine(result.GetProperty("parametersSchema").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("default").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("readOnly").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("required").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parametersSchema").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("default").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("readOnly").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("required").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("typeName").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("runner").ToString());
-                Console.WriteLine(result.GetProperty("runner").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("eligibleForLatestVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogItemId").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogItemName").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogName").ToString());
+                Console.WriteLine(result[0].GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("summary").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("templatePath").ToString());
+                Console.WriteLine(result[0].GetProperty("parametersSchema").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("default").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("readOnly").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("required").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parametersSchema").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("default").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("readOnly").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("required").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("typeName").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("runner").ToString());
+                Console.WriteLine(result[0].GetProperty("runner").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("eligibleForLatestVersion").ToString());
             }
         }
 
@@ -724,14 +710,14 @@ public void Example_GetCatalogItemVersions_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCatalogItemVersions_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetCatalogItemVersionsAsync("<catalogItemId>", 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetCatalogItemVersionsAsync("<catalogItemId>", null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -739,47 +725,47 @@ public async Task Example_GetCatalogItemVersions_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCatalogItemVersions_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetCatalogItemVersionsAsync("<catalogItemId>", 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetCatalogItemVersionsAsync("<catalogItemId>", 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("catalogItemId").ToString());
-                Console.WriteLine(result.GetProperty("catalogItemName").ToString());
-                Console.WriteLine(result.GetProperty("catalogName").ToString());
-                Console.WriteLine(result.GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("summary").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("templatePath").ToString());
-                Console.WriteLine(result.GetProperty("parametersSchema").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("default").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("readOnly").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("required").ToString());
-                Console.WriteLine(result.GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parametersSchema").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("default").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("readOnly").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("required").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("typeName").ToString());
-                Console.WriteLine(result.GetProperty("actions")[0].GetProperty("runner").ToString());
-                Console.WriteLine(result.GetProperty("runner").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("eligibleForLatestVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogItemId").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogItemName").ToString());
+                Console.WriteLine(result[0].GetProperty("catalogName").ToString());
+                Console.WriteLine(result[0].GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("summary").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("templatePath").ToString());
+                Console.WriteLine(result[0].GetProperty("parametersSchema").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("default").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("readOnly").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("required").ToString());
+                Console.WriteLine(result[0].GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parametersSchema").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("default").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("readOnly").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("required").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("parameters")[0].GetProperty("allowed")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("typeName").ToString());
+                Console.WriteLine(result[0].GetProperty("actions")[0].GetProperty("runner").ToString());
+                Console.WriteLine(result[0].GetProperty("runner").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("eligibleForLatestVersion").ToString());
             }
         }
 
@@ -787,14 +773,14 @@ public async Task Example_GetCatalogItemVersions_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEnvironmentTypes()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetEnvironmentTypes(1234, new RequestContext()))
+            foreach (BinaryData item in client.GetEnvironmentTypes(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -802,16 +788,16 @@ public void Example_GetEnvironmentTypes()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEnvironmentTypes_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            foreach (var item in client.GetEnvironmentTypes(1234, new RequestContext()))
+            foreach (BinaryData item in client.GetEnvironmentTypes(1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("deploymentTargetId").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentTargetId").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
             }
         }
 
@@ -819,14 +805,14 @@ public void Example_GetEnvironmentTypes_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEnvironmentTypes_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetEnvironmentTypesAsync(1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetEnvironmentTypesAsync(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -834,16 +820,16 @@ public async Task Example_GetEnvironmentTypes_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEnvironmentTypes_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            await foreach (var item in client.GetEnvironmentTypesAsync(1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetEnvironmentTypesAsync(1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("deploymentTargetId").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentTargetId").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
             }
         }
 
@@ -851,18 +837,17 @@ public async Task Example_GetEnvironmentTypes_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateEnvironment()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                environmentType = "<environmentType>",
-            };
-
-            var operation = client.CreateOrUpdateEnvironment(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
+                ["environmentType"] = "<environmentType>",
+            });
+            Operation<BinaryData> operation = client.CreateOrUpdateEnvironment(WaitUntil.Completed, "me", "<environmentName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("environmentType").ToString());
             Console.WriteLine(result.ToString());
@@ -872,36 +857,35 @@ public void Example_CreateOrUpdateEnvironment()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateEnvironment_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                environmentType = "<environmentType>",
-                user = "<user>",
-                description = "<description>",
-                catalogName = "<catalogName>",
-                catalogItemName = "<catalogItemName>",
-                parameters = new { },
-                scheduledTasks = new
+                ["environmentType"] = "<environmentType>",
+                ["user"] = "<user>",
+                ["description"] = "<description>",
+                ["catalogName"] = "<catalogName>",
+                ["catalogItemName"] = "<catalogItemName>",
+                ["parameters"] = new Dictionary<string, object>(),
+                ["scheduledTasks"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        type = "AutoExpire",
-                        enabled = "Enabled",
-                        startTime = "2022-05-10T18:57:31.2311892Z",
+                        ["type"] = "AutoExpire",
+                        ["enabled"] = "Enabled",
+                        ["startTime"] = "2022-05-10T18:57:31.2311892Z",
                     },
                 },
-                tags = new
+                ["tags"] = new Dictionary<string, object>()
                 {
-                    key = "<String>",
+                    ["key"] = "<tags>",
                 },
-            };
-
-            var operation = client.CreateOrUpdateEnvironment(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.CreateOrUpdateEnvironment(WaitUntil.Completed, "me", "<environmentName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
             Console.WriteLine(result.GetProperty("environmentType").ToString());
@@ -912,28 +896,27 @@ public void Example_CreateOrUpdateEnvironment_AllParameters()
             Console.WriteLine(result.GetProperty("catalogName").ToString());
             Console.WriteLine(result.GetProperty("catalogItemName").ToString());
             Console.WriteLine(result.GetProperty("parameters").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateEnvironment_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                environmentType = "<environmentType>",
-            };
-
-            var operation = await client.CreateOrUpdateEnvironmentAsync(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
+                ["environmentType"] = "<environmentType>",
+            });
+            Operation<BinaryData> operation = await client.CreateOrUpdateEnvironmentAsync(WaitUntil.Completed, "me", "<environmentName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("environmentType").ToString());
             Console.WriteLine(result.ToString());
@@ -943,36 +926,35 @@ public async Task Example_CreateOrUpdateEnvironment_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateEnvironment_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                environmentType = "<environmentType>",
-                user = "<user>",
-                description = "<description>",
-                catalogName = "<catalogName>",
-                catalogItemName = "<catalogItemName>",
-                parameters = new { },
-                scheduledTasks = new
+                ["environmentType"] = "<environmentType>",
+                ["user"] = "<user>",
+                ["description"] = "<description>",
+                ["catalogName"] = "<catalogName>",
+                ["catalogItemName"] = "<catalogItemName>",
+                ["parameters"] = new Dictionary<string, object>(),
+                ["scheduledTasks"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        type = "AutoExpire",
-                        enabled = "Enabled",
-                        startTime = "2022-05-10T18:57:31.2311892Z",
+                        ["type"] = "AutoExpire",
+                        ["enabled"] = "Enabled",
+                        ["startTime"] = "2022-05-10T18:57:31.2311892Z",
                     },
                 },
-                tags = new
+                ["tags"] = new Dictionary<string, object>()
                 {
-                    key = "<String>",
+                    ["key"] = "<tags>",
                 },
-            };
-
-            var operation = await client.CreateOrUpdateEnvironmentAsync(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.CreateOrUpdateEnvironmentAsync(WaitUntil.Completed, "me", "<environmentName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
             Console.WriteLine(result.GetProperty("environmentType").ToString());
@@ -983,210 +965,178 @@ public async Task Example_CreateOrUpdateEnvironment_AllParameters_Async()
             Console.WriteLine(result.GetProperty("catalogName").ToString());
             Console.WriteLine(result.GetProperty("catalogItemName").ToString());
             Console.WriteLine(result.GetProperty("parameters").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("type").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("enabled").ToString());
-            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<test>").GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("enabled").ToString());
+            Console.WriteLine(result.GetProperty("scheduledTasks").GetProperty("<key>").GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteEnvironment()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-            var operation = client.DeleteEnvironment(WaitUntil.Completed, "<userId>", "<environmentName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.DeleteEnvironment(WaitUntil.Completed, "me", "<environmentName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteEnvironment_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var operation = client.DeleteEnvironment(WaitUntil.Completed, "<userId>", "<environmentName>");
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.DeleteEnvironment(WaitUntil.Completed, "me", "<environmentName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteEnvironment_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-            var operation = await client.DeleteEnvironmentAsync(WaitUntil.Completed, "<userId>", "<environmentName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.DeleteEnvironmentAsync(WaitUntil.Completed, "me", "<environmentName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteEnvironment_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
-
-            var operation = await client.DeleteEnvironmentAsync(WaitUntil.Completed, "<userId>", "<environmentName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.DeleteEnvironmentAsync(WaitUntil.Completed, "me", "<environmentName>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_DeployEnvironmentAction()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                actionId = "<actionId>",
-            };
-
-            var operation = client.DeployEnvironmentAction(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+                ["actionId"] = "<actionId>",
+            });
+            Operation operation = client.DeployEnvironmentAction(WaitUntil.Completed, "me", "<environmentName>", content);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_DeployEnvironmentAction_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                actionId = "<actionId>",
-                parameters = new { },
-            };
-
-            var operation = client.DeployEnvironmentAction(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+                ["actionId"] = "<actionId>",
+                ["parameters"] = new Dictionary<string, object>(),
+            });
+            Operation operation = client.DeployEnvironmentAction(WaitUntil.Completed, "me", "<environmentName>", content);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeployEnvironmentAction_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                actionId = "<actionId>",
-            };
-
-            var operation = await client.DeployEnvironmentActionAsync(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+                ["actionId"] = "<actionId>",
+            });
+            Operation operation = await client.DeployEnvironmentActionAsync(WaitUntil.Completed, "me", "<environmentName>", content);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeployEnvironmentAction_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                actionId = "<actionId>",
-                parameters = new { },
-            };
-
-            var operation = await client.DeployEnvironmentActionAsync(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+                ["actionId"] = "<actionId>",
+                ["parameters"] = new Dictionary<string, object>(),
+            });
+            Operation operation = await client.DeployEnvironmentActionAsync(WaitUntil.Completed, "me", "<environmentName>", content);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CustomEnvironmentAction()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                actionId = "<actionId>",
-            };
-
-            var operation = client.CustomEnvironmentAction(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+                ["actionId"] = "<actionId>",
+            });
+            Operation operation = client.CustomEnvironmentAction(WaitUntil.Completed, "me", "<environmentName>", content);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CustomEnvironmentAction_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                actionId = "<actionId>",
-                parameters = new { },
-            };
-
-            var operation = client.CustomEnvironmentAction(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+                ["actionId"] = "<actionId>",
+                ["parameters"] = new Dictionary<string, object>(),
+            });
+            Operation operation = client.CustomEnvironmentAction(WaitUntil.Completed, "me", "<environmentName>", content);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CustomEnvironmentAction_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                actionId = "<actionId>",
-            };
-
-            var operation = await client.CustomEnvironmentActionAsync(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+                ["actionId"] = "<actionId>",
+            });
+            Operation operation = await client.CustomEnvironmentActionAsync(WaitUntil.Completed, "me", "<environmentName>", content);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CustomEnvironmentAction_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new EnvironmentsClient(endpoint, "<projectName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            EnvironmentsClient client = new EnvironmentsClient(endpoint, "<ProjectName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                actionId = "<actionId>",
-                parameters = new { },
-            };
-
-            var operation = await client.CustomEnvironmentActionAsync(WaitUntil.Completed, "<userId>", "<environmentName>", RequestContent.Create(data));
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+                ["actionId"] = "<actionId>",
+                ["parameters"] = new Dictionary<string, object>(),
+            });
+            Operation operation = await client.CustomEnvironmentActionAsync(WaitUntil.Completed, "me", "<environmentName>", content);
         }
     }
 }
diff --git a/sdk/deviceupdate/Azure.IoT.DeviceUpdate/src/Generated/Docs/DeviceManagementClient.xml b/sdk/deviceupdate/Azure.IoT.DeviceUpdate/src/Generated/Docs/DeviceManagementClient.xml
index f50a0025334d..bca8318df54f 100644
--- a/sdk/deviceupdate/Azure.IoT.DeviceUpdate/src/Generated/Docs/DeviceManagementClient.xml
+++ b/sdk/deviceupdate/Azure.IoT.DeviceUpdate/src/Generated/Docs/DeviceManagementClient.xml
@@ -2,12 +2,24 @@
 <doc>
   <members>
     <member name="GetDeviceClassAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceClassAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceClassAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetDeviceClassAsync("<deviceClassId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
+]]></code>
+This sample shows how to call GetDeviceClassAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetDeviceClassAsync("<deviceClassId>");
 
@@ -16,22 +28,33 @@ Console.WriteLine(result.GetProperty("deviceClassId").ToString());
 Console.WriteLine(result.GetProperty("friendlyName").ToString());
 Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("friendlyName").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeviceClass(string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceClass with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceClass and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetDeviceClass("<deviceClassId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
+]]></code>
+This sample shows how to call GetDeviceClass with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetDeviceClass("<deviceClassId>");
 
@@ -40,104 +63,162 @@ Console.WriteLine(result.GetProperty("deviceClassId").ToString());
 Console.WriteLine(result.GetProperty("friendlyName").ToString());
 Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("friendlyName").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateDeviceClassAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateDeviceClassAsync with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call UpdateDeviceClassAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["friendlyName"] = "<friendlyName>",
+});
+Response response = await client.UpdateDeviceClassAsync("<deviceClassId>", content);
 
-var data = new {
-    friendlyName = "<friendlyName>",
-};
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
+]]></code>
+This sample shows how to call UpdateDeviceClassAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-Response response = await client.UpdateDeviceClassAsync("<deviceClassId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["friendlyName"] = "<friendlyName>",
+});
+Response response = await client.UpdateDeviceClassAsync("<deviceClassId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("deviceClassId").ToString());
 Console.WriteLine(result.GetProperty("friendlyName").ToString());
 Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("friendlyName").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateDeviceClass(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateDeviceClass with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call UpdateDeviceClass and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-var data = new {
-    friendlyName = "<friendlyName>",
-};
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["friendlyName"] = "<friendlyName>",
+});
+Response response = client.UpdateDeviceClass("<deviceClassId>", content);
 
-Response response = client.UpdateDeviceClass("<deviceClassId>", RequestContent.Create(data));
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
+]]></code>
+This sample shows how to call UpdateDeviceClass with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["friendlyName"] = "<friendlyName>",
+});
+Response response = client.UpdateDeviceClass("<deviceClassId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("deviceClassId").ToString());
 Console.WriteLine(result.GetProperty("friendlyName").ToString());
 Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("friendlyName").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteDeviceClassAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteDeviceClassAsync with required parameters.
+      <example>
+This sample shows how to call DeleteDeviceClassAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.DeleteDeviceClassAsync("<deviceClassId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteDeviceClassAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.DeleteDeviceClassAsync("<deviceClassId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteDeviceClass(string,RequestContext)">
-<example>
-This sample shows how to call DeleteDeviceClass with required parameters.
+      <example>
+This sample shows how to call DeleteDeviceClass.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.DeleteDeviceClass("<deviceClassId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteDeviceClass with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.DeleteDeviceClass("<deviceClassId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetDeviceAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetDeviceAsync("<deviceId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deviceId").ToString());
+Console.WriteLine(result.GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("onLatestUpdate").ToString());
+]]></code>
+This sample shows how to call GetDeviceAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetDeviceAsync("<deviceId>");
 
@@ -171,16 +252,28 @@ Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResul
 Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultCode").ToString());
 Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("extendedResultCode").ToString());
 Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultDetails").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDevice(string,RequestContext)">
-<example>
-This sample shows how to call GetDevice with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDevice and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetDevice("<deviceId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deviceId").ToString());
+Console.WriteLine(result.GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("onLatestUpdate").ToString());
+]]></code>
+This sample shows how to call GetDevice with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetDevice("<deviceId>");
 
@@ -214,16 +307,28 @@ Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResul
 Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultCode").ToString());
 Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("extendedResultCode").ToString());
 Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultDetails").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeviceModuleAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceModuleAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceModuleAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetDeviceModuleAsync("<deviceId>", "<moduleId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deviceId").ToString());
+Console.WriteLine(result.GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("onLatestUpdate").ToString());
+]]></code>
+This sample shows how to call GetDeviceModuleAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetDeviceModuleAsync("<deviceId>", "<moduleId>");
 
@@ -257,16 +362,28 @@ Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResul
 Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultCode").ToString());
 Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("extendedResultCode").ToString());
 Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultDetails").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeviceModule(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceModule with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceModule and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetDeviceModule("<deviceId>", "<moduleId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deviceId").ToString());
+Console.WriteLine(result.GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("onLatestUpdate").ToString());
+]]></code>
+This sample shows how to call GetDeviceModule with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetDeviceModule("<deviceId>", "<moduleId>");
 
@@ -300,16 +417,15 @@ Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResul
 Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultCode").ToString());
 Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("extendedResultCode").ToString());
 Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultDetails").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetUpdateComplianceAsync(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetUpdateComplianceAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetUpdateComplianceAsync();
 
@@ -319,15 +435,28 @@ Console.WriteLine(result.GetProperty("onLatestUpdateDeviceCount").ToString());
 Console.WriteLine(result.GetProperty("newUpdatesAvailableDeviceCount").ToString());
 Console.WriteLine(result.GetProperty("updatesInProgressDeviceCount").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetUpdateComplianceAsync with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetUpdateComplianceAsync();
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("totalDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("onLatestUpdateDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("newUpdatesAvailableDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("updatesInProgressDeviceCount").ToString());
+]]></code></example>
     </member>
     <member name="GetUpdateCompliance(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetUpdateCompliance and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetUpdateCompliance();
 
@@ -337,15 +466,41 @@ Console.WriteLine(result.GetProperty("onLatestUpdateDeviceCount").ToString());
 Console.WriteLine(result.GetProperty("newUpdatesAvailableDeviceCount").ToString());
 Console.WriteLine(result.GetProperty("updatesInProgressDeviceCount").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetUpdateCompliance with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetUpdateCompliance();
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("totalDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("onLatestUpdateDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("newUpdatesAvailableDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("updatesInProgressDeviceCount").ToString());
+]]></code></example>
     </member>
     <member name="GetGroupAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetGroupAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGroupAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetGroupAsync("<groupId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("groupId").ToString());
+Console.WriteLine(result.GetProperty("groupType").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+]]></code>
+This sample shows how to call GetGroupAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetGroupAsync("<groupId>");
 
@@ -358,16 +513,28 @@ Console.WriteLine(result.GetProperty("subgroupsWithNewUpdatesAvailableCount").To
 Console.WriteLine(result.GetProperty("subgroupsWithUpdatesInProgressCount").ToString());
 Console.WriteLine(result.GetProperty("subgroupsWithOnLatestUpdateCount").ToString());
 Console.WriteLine(result.GetProperty("deployments")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGroup(string,RequestContext)">
-<example>
-This sample shows how to call GetGroup with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGroup and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetGroup("<groupId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("groupId").ToString());
+Console.WriteLine(result.GetProperty("groupType").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+]]></code>
+This sample shows how to call GetGroup with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetGroup("<groupId>");
 
@@ -380,42 +547,57 @@ Console.WriteLine(result.GetProperty("subgroupsWithNewUpdatesAvailableCount").To
 Console.WriteLine(result.GetProperty("subgroupsWithUpdatesInProgressCount").ToString());
 Console.WriteLine(result.GetProperty("subgroupsWithOnLatestUpdateCount").ToString());
 Console.WriteLine(result.GetProperty("deployments")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteGroupAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteGroupAsync with required parameters.
+      <example>
+This sample shows how to call DeleteGroupAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.DeleteGroupAsync("<groupId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteGroupAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.DeleteGroupAsync("<groupId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteGroup(string,RequestContext)">
-<example>
-This sample shows how to call DeleteGroup with required parameters.
+      <example>
+This sample shows how to call DeleteGroup.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.DeleteGroup("<groupId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteGroup with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.DeleteGroup("<groupId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetUpdateComplianceForGroupAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetUpdateComplianceForGroupAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetUpdateComplianceForGroupAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetUpdateComplianceForGroupAsync("<groupId>");
 
@@ -425,15 +607,28 @@ Console.WriteLine(result.GetProperty("onLatestUpdateDeviceCount").ToString());
 Console.WriteLine(result.GetProperty("newUpdatesAvailableDeviceCount").ToString());
 Console.WriteLine(result.GetProperty("updatesInProgressDeviceCount").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetUpdateComplianceForGroupAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetUpdateComplianceForGroupAsync("<groupId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("totalDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("onLatestUpdateDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("newUpdatesAvailableDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("updatesInProgressDeviceCount").ToString());
+]]></code></example>
     </member>
     <member name="GetUpdateComplianceForGroup(string,RequestContext)">
-<example>
-This sample shows how to call GetUpdateComplianceForGroup with required parameters and parse the result.
+      <example>
+This sample shows how to call GetUpdateComplianceForGroup and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetUpdateComplianceForGroup("<groupId>");
 
@@ -443,15 +638,44 @@ Console.WriteLine(result.GetProperty("onLatestUpdateDeviceCount").ToString());
 Console.WriteLine(result.GetProperty("newUpdatesAvailableDeviceCount").ToString());
 Console.WriteLine(result.GetProperty("updatesInProgressDeviceCount").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetUpdateComplianceForGroup with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetUpdateComplianceForGroup("<groupId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("totalDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("onLatestUpdateDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("newUpdatesAvailableDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("updatesInProgressDeviceCount").ToString());
+]]></code></example>
     </member>
     <member name="GetDeploymentAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeploymentAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeploymentAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetDeploymentAsync("<groupId>", "<deploymentId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deploymentId").ToString());
+Console.WriteLine(result.GetProperty("startDateTime").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("groupId").ToString());
+]]></code>
+This sample shows how to call GetDeploymentAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetDeploymentAsync("<groupId>", "<deploymentId>");
 
@@ -475,16 +699,31 @@ Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").Get
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
 Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeployment(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeployment with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeployment and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetDeployment("<groupId>", "<deploymentId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deploymentId").ToString());
+Console.WriteLine(result.GetProperty("startDateTime").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("groupId").ToString());
+]]></code>
+This sample shows how to call GetDeployment with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetDeployment("<groupId>", "<deploymentId>");
 
@@ -508,31 +747,32 @@ Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").Get
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
 Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateDeploymentAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateDeploymentAsync with required parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
-
-var data = new {
-    deploymentId = "<deploymentId>",
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    update = new {
-        updateId = new {
-            provider = "<provider>",
-            name = "<name>",
-            version = "<version>",
+      <example>
+This sample shows how to call CreateOrUpdateDeploymentAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["deploymentId"] = "<deploymentId>",
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["update"] = new Dictionary<string, object>()
+    {
+        ["updateId"] = new Dictionary<string, object>()
+        {
+            ["provider"] = "<provider>",
+            ["name"] = "<name>",
+            ["version"] = "<version>",
         },
     },
-    groupId = "<groupId>",
-};
-
-Response response = await client.CreateOrUpdateDeploymentAsync("<groupId>", "<deploymentId>", RequestContent.Create(data));
+    ["groupId"] = "<groupId>",
+});
+Response response = await client.CreateOrUpdateDeploymentAsync("<groupId>", "<deploymentId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("deploymentId").ToString());
@@ -542,45 +782,45 @@ Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProper
 Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("groupId").ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateDeploymentAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateDeploymentAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-var data = new {
-    deploymentId = "<deploymentId>",
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    update = new {
-        updateId = new {
-            provider = "<provider>",
-            name = "<name>",
-            version = "<version>",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["deploymentId"] = "<deploymentId>",
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["update"] = new Dictionary<string, object>()
+    {
+        ["updateId"] = new Dictionary<string, object>()
+        {
+            ["provider"] = "<provider>",
+            ["name"] = "<name>",
+            ["version"] = "<version>",
         },
     },
-    groupId = "<groupId>",
-    deviceClassSubgroups = new[] {
-        "<String>"
-    },
-    isCanceled = true,
-    isRetried = true,
-    rollbackPolicy = new {
-        update = new {
-            updateId = new {
-                provider = "<provider>",
-                name = "<name>",
-                version = "<version>",
-            },
-        },
-        failure = new {
-            devicesFailedPercentage = 1234,
-            devicesFailedCount = 1234,
+    ["groupId"] = "<groupId>",
+    ["deviceClassSubgroups"] = new List<object>()
+{
+"<deviceClassSubgroups>"
+},
+    ["isCanceled"] = true,
+    ["isRetried"] = true,
+    ["rollbackPolicy"] = new Dictionary<string, object>()
+    {
+        ["update"] = null
+,
+        ["failure"] = new Dictionary<string, object>()
+        {
+            ["devicesFailedPercentage"] = 1234,
+            ["devicesFailedCount"] = 1234,
         },
     },
-    isCloudInitiatedRollback = true,
-};
-
-Response response = await client.CreateOrUpdateDeploymentAsync("<groupId>", "<deploymentId>", RequestContent.Create(data));
+    ["isCloudInitiatedRollback"] = true,
+});
+Response response = await client.CreateOrUpdateDeploymentAsync("<groupId>", "<deploymentId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("deploymentId").ToString());
@@ -602,31 +842,32 @@ Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").Get
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
 Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateDeployment(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateDeployment with required parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
-
-var data = new {
-    deploymentId = "<deploymentId>",
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    update = new {
-        updateId = new {
-            provider = "<provider>",
-            name = "<name>",
-            version = "<version>",
+      <example>
+This sample shows how to call CreateOrUpdateDeployment and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["deploymentId"] = "<deploymentId>",
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["update"] = new Dictionary<string, object>()
+    {
+        ["updateId"] = new Dictionary<string, object>()
+        {
+            ["provider"] = "<provider>",
+            ["name"] = "<name>",
+            ["version"] = "<version>",
         },
     },
-    groupId = "<groupId>",
-};
-
-Response response = client.CreateOrUpdateDeployment("<groupId>", "<deploymentId>", RequestContent.Create(data));
+    ["groupId"] = "<groupId>",
+});
+Response response = client.CreateOrUpdateDeployment("<groupId>", "<deploymentId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("deploymentId").ToString());
@@ -636,45 +877,45 @@ Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProper
 Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("groupId").ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateDeployment with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateDeployment with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-var data = new {
-    deploymentId = "<deploymentId>",
-    startDateTime = "2022-05-10T18:57:31.2311892Z",
-    update = new {
-        updateId = new {
-            provider = "<provider>",
-            name = "<name>",
-            version = "<version>",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["deploymentId"] = "<deploymentId>",
+    ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+    ["update"] = new Dictionary<string, object>()
+    {
+        ["updateId"] = new Dictionary<string, object>()
+        {
+            ["provider"] = "<provider>",
+            ["name"] = "<name>",
+            ["version"] = "<version>",
         },
     },
-    groupId = "<groupId>",
-    deviceClassSubgroups = new[] {
-        "<String>"
-    },
-    isCanceled = true,
-    isRetried = true,
-    rollbackPolicy = new {
-        update = new {
-            updateId = new {
-                provider = "<provider>",
-                name = "<name>",
-                version = "<version>",
-            },
-        },
-        failure = new {
-            devicesFailedPercentage = 1234,
-            devicesFailedCount = 1234,
+    ["groupId"] = "<groupId>",
+    ["deviceClassSubgroups"] = new List<object>()
+{
+"<deviceClassSubgroups>"
+},
+    ["isCanceled"] = true,
+    ["isRetried"] = true,
+    ["rollbackPolicy"] = new Dictionary<string, object>()
+    {
+        ["update"] = null
+,
+        ["failure"] = new Dictionary<string, object>()
+        {
+            ["devicesFailedPercentage"] = 1234,
+            ["devicesFailedCount"] = 1234,
         },
     },
-    isCloudInitiatedRollback = true,
-};
-
-Response response = client.CreateOrUpdateDeployment("<groupId>", "<deploymentId>", RequestContent.Create(data));
+    ["isCloudInitiatedRollback"] = true,
+});
+Response response = client.CreateOrUpdateDeployment("<groupId>", "<deploymentId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("deploymentId").ToString());
@@ -696,42 +937,72 @@ Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").Get
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
 Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteDeploymentAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteDeploymentAsync with required parameters.
+      <example>
+This sample shows how to call DeleteDeploymentAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.DeleteDeploymentAsync("<groupId>", "<deploymentId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteDeploymentAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.DeleteDeploymentAsync("<groupId>", "<deploymentId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteDeployment(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteDeployment with required parameters.
+      <example>
+This sample shows how to call DeleteDeployment.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.DeleteDeployment("<groupId>", "<deploymentId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteDeployment with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.DeleteDeployment("<groupId>", "<deploymentId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetDeploymentStatusAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeploymentStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeploymentStatusAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetDeploymentStatusAsync("<groupId>", "<deploymentId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("groupId").ToString());
+Console.WriteLine(result.GetProperty("deploymentState").ToString());
+Console.WriteLine(result.GetProperty("subgroupStatus")[0].GetProperty("groupId").ToString());
+Console.WriteLine(result.GetProperty("subgroupStatus")[0].GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("subgroupStatus")[0].GetProperty("deploymentState").ToString());
+]]></code>
+This sample shows how to call GetDeploymentStatusAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetDeploymentStatusAsync("<groupId>", "<deploymentId>");
 
@@ -760,16 +1031,30 @@ Console.WriteLine(result.GetProperty("subgroupStatus")[0].GetProperty("devicesIn
 Console.WriteLine(result.GetProperty("subgroupStatus")[0].GetProperty("devicesCompletedFailedCount").ToString());
 Console.WriteLine(result.GetProperty("subgroupStatus")[0].GetProperty("devicesCompletedSucceededCount").ToString());
 Console.WriteLine(result.GetProperty("subgroupStatus")[0].GetProperty("devicesCanceledCount").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeploymentStatus(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeploymentStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeploymentStatus and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetDeploymentStatus("<groupId>", "<deploymentId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("groupId").ToString());
+Console.WriteLine(result.GetProperty("deploymentState").ToString());
+Console.WriteLine(result.GetProperty("subgroupStatus")[0].GetProperty("groupId").ToString());
+Console.WriteLine(result.GetProperty("subgroupStatus")[0].GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("subgroupStatus")[0].GetProperty("deploymentState").ToString());
+]]></code>
+This sample shows how to call GetDeploymentStatus with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetDeploymentStatus("<groupId>", "<deploymentId>");
 
@@ -798,16 +1083,28 @@ Console.WriteLine(result.GetProperty("subgroupStatus")[0].GetProperty("devicesIn
 Console.WriteLine(result.GetProperty("subgroupStatus")[0].GetProperty("devicesCompletedFailedCount").ToString());
 Console.WriteLine(result.GetProperty("subgroupStatus")[0].GetProperty("devicesCompletedSucceededCount").ToString());
 Console.WriteLine(result.GetProperty("subgroupStatus")[0].GetProperty("devicesCanceledCount").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeviceClassSubgroupAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceClassSubgroupAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceClassSubgroupAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("groupId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+]]></code>
+This sample shows how to call GetDeviceClassSubgroupAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>");
 
@@ -817,16 +1114,28 @@ Console.WriteLine(result.GetProperty("groupId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("deviceCount").ToString());
 Console.WriteLine(result.GetProperty("deploymentId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeviceClassSubgroup(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceClassSubgroup with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceClassSubgroup and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetDeviceClassSubgroup("<groupId>", "<deviceClassId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("groupId").ToString());
+Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+]]></code>
+This sample shows how to call GetDeviceClassSubgroup with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetDeviceClassSubgroup("<groupId>", "<deviceClassId>");
 
@@ -836,42 +1145,57 @@ Console.WriteLine(result.GetProperty("groupId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("deviceCount").ToString());
 Console.WriteLine(result.GetProperty("deploymentId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteDeviceClassSubgroupAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteDeviceClassSubgroupAsync with required parameters.
+      <example>
+This sample shows how to call DeleteDeviceClassSubgroupAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.DeleteDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteDeviceClassSubgroupAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.DeleteDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteDeviceClassSubgroup(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteDeviceClassSubgroup with required parameters.
+      <example>
+This sample shows how to call DeleteDeviceClassSubgroup.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.DeleteDeviceClassSubgroup("<groupId>", "<deviceClassId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteDeviceClassSubgroup with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.DeleteDeviceClassSubgroup("<groupId>", "<deviceClassId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetDeviceClassSubgroupUpdateComplianceAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceClassSubgroupUpdateComplianceAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceClassSubgroupUpdateComplianceAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetDeviceClassSubgroupUpdateComplianceAsync("<groupId>", "<deviceClassId>");
 
@@ -881,15 +1205,42 @@ Console.WriteLine(result.GetProperty("onLatestUpdateDeviceCount").ToString());
 Console.WriteLine(result.GetProperty("newUpdatesAvailableDeviceCount").ToString());
 Console.WriteLine(result.GetProperty("updatesInProgressDeviceCount").ToString());
 ]]></code>
-</example>
+This sample shows how to call GetDeviceClassSubgroupUpdateComplianceAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetDeviceClassSubgroupUpdateComplianceAsync("<groupId>", "<deviceClassId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("totalDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("onLatestUpdateDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("newUpdatesAvailableDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("updatesInProgressDeviceCount").ToString());
+]]></code></example>
     </member>
     <member name="GetDeviceClassSubgroupUpdateCompliance(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceClassSubgroupUpdateCompliance with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceClassSubgroupUpdateCompliance and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetDeviceClassSubgroupUpdateCompliance("<groupId>", "<deviceClassId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("totalDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("onLatestUpdateDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("newUpdatesAvailableDeviceCount").ToString());
+Console.WriteLine(result.GetProperty("updatesInProgressDeviceCount").ToString());
+]]></code>
+This sample shows how to call GetDeviceClassSubgroupUpdateCompliance with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetDeviceClassSubgroupUpdateCompliance("<groupId>", "<deviceClassId>");
 
@@ -898,16 +1249,31 @@ Console.WriteLine(result.GetProperty("totalDeviceCount").ToString());
 Console.WriteLine(result.GetProperty("onLatestUpdateDeviceCount").ToString());
 Console.WriteLine(result.GetProperty("newUpdatesAvailableDeviceCount").ToString());
 Console.WriteLine(result.GetProperty("updatesInProgressDeviceCount").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetBestUpdatesForDeviceClassSubgroupAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetBestUpdatesForDeviceClassSubgroupAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBestUpdatesForDeviceClassSubgroupAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetBestUpdatesForDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("groupId").ToString());
+Console.WriteLine(result.GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("deviceCount").ToString());
+]]></code>
+This sample shows how to call GetBestUpdatesForDeviceClassSubgroupAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetBestUpdatesForDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>");
 
@@ -920,16 +1286,31 @@ Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProper
 Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
 Console.WriteLine(result.GetProperty("deviceCount").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetBestUpdatesForDeviceClassSubgroup(string,string,RequestContext)">
-<example>
-This sample shows how to call GetBestUpdatesForDeviceClassSubgroup with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBestUpdatesForDeviceClassSubgroup and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetBestUpdatesForDeviceClassSubgroup("<groupId>", "<deviceClassId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("groupId").ToString());
+Console.WriteLine(result.GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("deviceCount").ToString());
+]]></code>
+This sample shows how to call GetBestUpdatesForDeviceClassSubgroup with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetBestUpdatesForDeviceClassSubgroup("<groupId>", "<deviceClassId>");
 
@@ -942,16 +1323,31 @@ Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProper
 Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
 Console.WriteLine(result.GetProperty("deviceCount").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeploymentForDeviceClassSubgroupAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeploymentForDeviceClassSubgroupAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeploymentForDeviceClassSubgroupAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetDeploymentForDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deploymentId").ToString());
+Console.WriteLine(result.GetProperty("startDateTime").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("groupId").ToString());
+]]></code>
+This sample shows how to call GetDeploymentForDeviceClassSubgroupAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetDeploymentForDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -975,16 +1371,31 @@ Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").Get
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
 Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeploymentForDeviceClassSubgroup(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeploymentForDeviceClassSubgroup with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeploymentForDeviceClassSubgroup and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetDeploymentForDeviceClassSubgroup("<groupId>", "<deviceClassId>", "<deploymentId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deploymentId").ToString());
+Console.WriteLine(result.GetProperty("startDateTime").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("groupId").ToString());
+]]></code>
+This sample shows how to call GetDeploymentForDeviceClassSubgroup with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetDeploymentForDeviceClassSubgroup("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1008,42 +1419,73 @@ Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").Get
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
 Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteDeploymentForDeviceClassSubgroupAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteDeploymentForDeviceClassSubgroupAsync with required parameters.
+      <example>
+This sample shows how to call DeleteDeploymentForDeviceClassSubgroupAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.DeleteDeploymentForDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteDeploymentForDeviceClassSubgroupAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.DeleteDeploymentForDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteDeploymentForDeviceClassSubgroup(string,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteDeploymentForDeviceClassSubgroup with required parameters.
+      <example>
+This sample shows how to call DeleteDeploymentForDeviceClassSubgroup.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.DeleteDeploymentForDeviceClassSubgroup("<groupId>", "<deviceClassId>", "<deploymentId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteDeploymentForDeviceClassSubgroup with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.DeleteDeploymentForDeviceClassSubgroup("<groupId>", "<deviceClassId>", "<deploymentId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="StopDeploymentAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call StopDeploymentAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call StopDeploymentAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.StopDeploymentAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deploymentId").ToString());
+Console.WriteLine(result.GetProperty("startDateTime").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("groupId").ToString());
+]]></code>
+This sample shows how to call StopDeploymentAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.StopDeploymentAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1067,16 +1509,31 @@ Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").Get
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
 Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="StopDeployment(string,string,string,RequestContext)">
-<example>
-This sample shows how to call StopDeployment with required parameters and parse the result.
+      <example>
+This sample shows how to call StopDeployment and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.StopDeployment("<groupId>", "<deviceClassId>", "<deploymentId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deploymentId").ToString());
+Console.WriteLine(result.GetProperty("startDateTime").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("groupId").ToString());
+]]></code>
+This sample shows how to call StopDeployment with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.StopDeployment("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1100,16 +1557,31 @@ Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").Get
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
 Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RetryDeploymentAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call RetryDeploymentAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call RetryDeploymentAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.RetryDeploymentAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deploymentId").ToString());
+Console.WriteLine(result.GetProperty("startDateTime").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("groupId").ToString());
+]]></code>
+This sample shows how to call RetryDeploymentAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.RetryDeploymentAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1133,16 +1605,31 @@ Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").Get
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
 Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RetryDeployment(string,string,string,RequestContext)">
-<example>
-This sample shows how to call RetryDeployment with required parameters and parse the result.
+      <example>
+This sample shows how to call RetryDeployment and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.RetryDeployment("<groupId>", "<deviceClassId>", "<deploymentId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deploymentId").ToString());
+Console.WriteLine(result.GetProperty("startDateTime").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("groupId").ToString());
+]]></code>
+This sample shows how to call RetryDeployment with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.RetryDeployment("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1166,16 +1653,28 @@ Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").Get
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
 Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
 Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeviceClassSubgroupDeploymentStatusAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceClassSubgroupDeploymentStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceClassSubgroupDeploymentStatusAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetDeviceClassSubgroupDeploymentStatusAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("groupId").ToString());
+Console.WriteLine(result.GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("deploymentState").ToString());
+]]></code>
+This sample shows how to call GetDeviceClassSubgroupDeploymentStatusAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetDeviceClassSubgroupDeploymentStatusAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1195,16 +1694,28 @@ Console.WriteLine(result.GetProperty("devicesInProgressCount").ToString());
 Console.WriteLine(result.GetProperty("devicesCompletedFailedCount").ToString());
 Console.WriteLine(result.GetProperty("devicesCompletedSucceededCount").ToString());
 Console.WriteLine(result.GetProperty("devicesCanceledCount").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeviceClassSubgroupDeploymentStatus(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceClassSubgroupDeploymentStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceClassSubgroupDeploymentStatus and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetDeviceClassSubgroupDeploymentStatus("<groupId>", "<deviceClassId>", "<deploymentId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("groupId").ToString());
+Console.WriteLine(result.GetProperty("deviceClassId").ToString());
+Console.WriteLine(result.GetProperty("deploymentState").ToString());
+]]></code>
+This sample shows how to call GetDeviceClassSubgroupDeploymentStatus with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetDeviceClassSubgroupDeploymentStatus("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1224,16 +1735,15 @@ Console.WriteLine(result.GetProperty("devicesInProgressCount").ToString());
 Console.WriteLine(result.GetProperty("devicesCompletedFailedCount").ToString());
 Console.WriteLine(result.GetProperty("devicesCompletedSucceededCount").ToString());
 Console.WriteLine(result.GetProperty("devicesCanceledCount").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetOperationStatusAsync(string,ETag?,RequestContext)">
-<example>
-This sample shows how to call GetOperationStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetOperationStatusAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetOperationStatusAsync("<operationId>");
 
@@ -1243,13 +1753,13 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 ]]></code>
-This sample shows how to call GetOperationStatusAsync with all parameters, and how to parse the result.
+This sample shows how to call GetOperationStatusAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-Response response = await client.GetOperationStatusAsync("<operationId>", null);
+Response response = await client.GetOperationStatusAsync("<operationId>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("operationId").ToString());
@@ -1265,16 +1775,15 @@ Console.WriteLine(result.GetProperty("traceId").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("etag").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetOperationStatus(string,ETag?,RequestContext)">
-<example>
-This sample shows how to call GetOperationStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetOperationStatus and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetOperationStatus("<operationId>");
 
@@ -1284,13 +1793,13 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 ]]></code>
-This sample shows how to call GetOperationStatus with all parameters, and how to parse the result.
+This sample shows how to call GetOperationStatus with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-Response response = client.GetOperationStatus("<operationId>", null);
+Response response = client.GetOperationStatus("<operationId>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("operationId").ToString());
@@ -1306,48 +1815,51 @@ Console.WriteLine(result.GetProperty("traceId").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("etag").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="StartLogCollectionAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call StartLogCollectionAsync with required parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
-
-var data = new {
-    deviceList = new[] {
-        new {
-            deviceId = "<deviceId>",
-        }
-    },
-};
+      <example>
+This sample shows how to call StartLogCollectionAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-Response response = await client.StartLogCollectionAsync("<logCollectionId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["deviceList"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["deviceId"] = "<deviceId>",
+}
+},
+});
+Response response = await client.StartLogCollectionAsync("<logCollectionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
 ]]></code>
-This sample shows how to call StartLogCollectionAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call StartLogCollectionAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
-
-var data = new {
-    operationId = "<operationId>",
-    deviceList = new[] {
-        new {
-            deviceId = "<deviceId>",
-            moduleId = "<moduleId>",
-        }
-    },
-    description = "<description>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-Response response = await client.StartLogCollectionAsync("<logCollectionId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["operationId"] = "<operationId>",
+    ["deviceList"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["deviceId"] = "<deviceId>",
+["moduleId"] = "<moduleId>",
+}
+},
+    ["description"] = "<description>",
+});
+Response response = await client.StartLogCollectionAsync("<logCollectionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("operationId").ToString());
@@ -1357,48 +1869,51 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="StartLogCollection(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call StartLogCollection with required parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
-
-var data = new {
-    deviceList = new[] {
-        new {
-            deviceId = "<deviceId>",
-        }
-    },
-};
+      <example>
+This sample shows how to call StartLogCollection and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-Response response = client.StartLogCollection("<logCollectionId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["deviceList"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["deviceId"] = "<deviceId>",
+}
+},
+});
+Response response = client.StartLogCollection("<logCollectionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
 ]]></code>
-This sample shows how to call StartLogCollection with all parameters and request content, and how to parse the result.
+This sample shows how to call StartLogCollection with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
-
-var data = new {
-    operationId = "<operationId>",
-    deviceList = new[] {
-        new {
-            deviceId = "<deviceId>",
-            moduleId = "<moduleId>",
-        }
-    },
-    description = "<description>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-Response response = client.StartLogCollection("<logCollectionId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["operationId"] = "<operationId>",
+    ["deviceList"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["deviceId"] = "<deviceId>",
+["moduleId"] = "<moduleId>",
+}
+},
+    ["description"] = "<description>",
+});
+Response response = client.StartLogCollection("<logCollectionId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("operationId").ToString());
@@ -1408,16 +1923,26 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetLogCollectionAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetLogCollectionAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLogCollectionAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetLogCollectionAsync("<logCollectionId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
+]]></code>
+This sample shows how to call GetLogCollectionAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetLogCollectionAsync("<logCollectionId>");
 
@@ -1429,16 +1954,26 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetLogCollection(string,RequestContext)">
-<example>
-This sample shows how to call GetLogCollection with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLogCollection and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetLogCollection("<logCollectionId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
+]]></code>
+This sample shows how to call GetLogCollection with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetLogCollection("<logCollectionId>");
 
@@ -1450,16 +1985,26 @@ Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetLogCollectionDetailedStatusAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetLogCollectionDetailedStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLogCollectionDetailedStatusAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = await client.GetLogCollectionDetailedStatusAsync("<logCollectionId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetLogCollectionDetailedStatusAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetLogCollectionDetailedStatusAsync("<logCollectionId>");
 
@@ -1475,16 +2020,26 @@ Console.WriteLine(result.GetProperty("deviceStatus")[0].GetProperty("resultCode"
 Console.WriteLine(result.GetProperty("deviceStatus")[0].GetProperty("extendedResultCode").ToString());
 Console.WriteLine(result.GetProperty("deviceStatus")[0].GetProperty("logLocation").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetLogCollectionDetailedStatus(string,RequestContext)">
-<example>
-This sample shows how to call GetLogCollectionDetailedStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLogCollectionDetailedStatus and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+Response response = client.GetLogCollectionDetailedStatus("<logCollectionId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetLogCollectionDetailedStatus with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetLogCollectionDetailedStatus("<logCollectionId>");
 
@@ -1500,906 +2055,1005 @@ Console.WriteLine(result.GetProperty("deviceStatus")[0].GetProperty("resultCode"
 Console.WriteLine(result.GetProperty("deviceStatus")[0].GetProperty("extendedResultCode").ToString());
 Console.WriteLine(result.GetProperty("deviceStatus")[0].GetProperty("logLocation").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeviceClassesAsync(string,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetDeviceClassesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetDeviceClassesAsync())
+await foreach (BinaryData item in client.GetDeviceClassesAsync())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
 }
 ]]></code>
-This sample shows how to call GetDeviceClassesAsync with all parameters, and how to parse the result.
+This sample shows how to call GetDeviceClassesAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetDeviceClassesAsync("<filter>"))
+await foreach (BinaryData item in client.GetDeviceClassesAsync(filter: "<filter>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-    Console.WriteLine(result.GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("friendlyName").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeviceClasses(string,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetDeviceClasses and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetDeviceClasses())
+foreach (BinaryData item in client.GetDeviceClasses())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
 }
 ]]></code>
-This sample shows how to call GetDeviceClasses with all parameters, and how to parse the result.
+This sample shows how to call GetDeviceClasses with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetDeviceClasses("<filter>"))
+foreach (BinaryData item in client.GetDeviceClasses(filter: "<filter>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-    Console.WriteLine(result.GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("friendlyName").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetInstallableUpdatesForDeviceClassesAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetInstallableUpdatesForDeviceClassesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetInstallableUpdatesForDeviceClassesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetInstallableUpdatesForDeviceClassesAsync("<deviceClassId>"))
+await foreach (BinaryData item in client.GetInstallableUpdatesForDeviceClassesAsync("<deviceClassId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetInstallableUpdatesForDeviceClassesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+await foreach (BinaryData item in client.GetInstallableUpdatesForDeviceClassesAsync("<deviceClassId>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetInstallableUpdatesForDeviceClasses(string,RequestContext)">
-<example>
-This sample shows how to call GetInstallableUpdatesForDeviceClasses with required parameters and parse the result.
+      <example>
+This sample shows how to call GetInstallableUpdatesForDeviceClasses and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetInstallableUpdatesForDeviceClasses("<deviceClassId>"))
+foreach (BinaryData item in client.GetInstallableUpdatesForDeviceClasses("<deviceClassId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetInstallableUpdatesForDeviceClasses with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+foreach (BinaryData item in client.GetInstallableUpdatesForDeviceClasses("<deviceClassId>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetDevicesAsync(string,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetDevicesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetDevicesAsync())
+await foreach (BinaryData item in client.GetDevicesAsync())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceId").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-    Console.WriteLine(result.GetProperty("onLatestUpdate").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("onLatestUpdate").ToString());
 }
 ]]></code>
-This sample shows how to call GetDevicesAsync with all parameters, and how to parse the result.
+This sample shows how to call GetDevicesAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetDevicesAsync("<filter>"))
+await foreach (BinaryData item in client.GetDevicesAsync(filter: "<filter>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceId").ToString());
-    Console.WriteLine(result.GetProperty("moduleId").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("deploymentStatus").ToString());
-    Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("onLatestUpdate").ToString());
-    Console.WriteLine(result.GetProperty("lastDeploymentId").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("resultCode").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("extendedResultCode").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("resultDetails").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultCode").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("extendedResultCode").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultDetails").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("moduleId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentStatus").ToString());
+    Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("onLatestUpdate").ToString());
+    Console.WriteLine(result[0].GetProperty("lastDeploymentId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("resultCode").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("extendedResultCode").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("resultDetails").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultCode").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("extendedResultCode").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultDetails").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDevices(string,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetDevices and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetDevices())
+foreach (BinaryData item in client.GetDevices())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceId").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-    Console.WriteLine(result.GetProperty("onLatestUpdate").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("onLatestUpdate").ToString());
 }
 ]]></code>
-This sample shows how to call GetDevices with all parameters, and how to parse the result.
+This sample shows how to call GetDevices with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetDevices("<filter>"))
+foreach (BinaryData item in client.GetDevices(filter: "<filter>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceId").ToString());
-    Console.WriteLine(result.GetProperty("moduleId").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("deploymentStatus").ToString());
-    Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("onLatestUpdate").ToString());
-    Console.WriteLine(result.GetProperty("lastDeploymentId").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("resultCode").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("extendedResultCode").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("resultDetails").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultCode").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("extendedResultCode").ToString());
-    Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultDetails").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("moduleId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentStatus").ToString());
+    Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("onLatestUpdate").ToString());
+    Console.WriteLine(result[0].GetProperty("lastDeploymentId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("resultCode").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("extendedResultCode").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("resultDetails").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultCode").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("extendedResultCode").ToString());
+    Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultDetails").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGroupsAsync(string,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetGroupsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetGroupsAsync())
+await foreach (BinaryData item in client.GetGroupsAsync())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("groupType").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("groupType").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
 }
 ]]></code>
-This sample shows how to call GetGroupsAsync with all parameters, and how to parse the result.
+This sample shows how to call GetGroupsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetGroupsAsync("<orderBy>"))
+await foreach (BinaryData item in client.GetGroupsAsync(orderBy: "<orderBy>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("groupType").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("deviceCount").ToString());
-    Console.WriteLine(result.GetProperty("subgroupsWithNewUpdatesAvailableCount").ToString());
-    Console.WriteLine(result.GetProperty("subgroupsWithUpdatesInProgressCount").ToString());
-    Console.WriteLine(result.GetProperty("subgroupsWithOnLatestUpdateCount").ToString());
-    Console.WriteLine(result.GetProperty("deployments")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("groupType").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
+    Console.WriteLine(result[0].GetProperty("subgroupsWithNewUpdatesAvailableCount").ToString());
+    Console.WriteLine(result[0].GetProperty("subgroupsWithUpdatesInProgressCount").ToString());
+    Console.WriteLine(result[0].GetProperty("subgroupsWithOnLatestUpdateCount").ToString());
+    Console.WriteLine(result[0].GetProperty("deployments")[0].ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGroups(string,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetGroups and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetGroups())
+foreach (BinaryData item in client.GetGroups())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("groupType").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("groupType").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
 }
 ]]></code>
-This sample shows how to call GetGroups with all parameters, and how to parse the result.
+This sample shows how to call GetGroups with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetGroups("<orderBy>"))
+foreach (BinaryData item in client.GetGroups(orderBy: "<orderBy>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("groupType").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("deviceCount").ToString());
-    Console.WriteLine(result.GetProperty("subgroupsWithNewUpdatesAvailableCount").ToString());
-    Console.WriteLine(result.GetProperty("subgroupsWithUpdatesInProgressCount").ToString());
-    Console.WriteLine(result.GetProperty("subgroupsWithOnLatestUpdateCount").ToString());
-    Console.WriteLine(result.GetProperty("deployments")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("groupType").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
+    Console.WriteLine(result[0].GetProperty("subgroupsWithNewUpdatesAvailableCount").ToString());
+    Console.WriteLine(result[0].GetProperty("subgroupsWithUpdatesInProgressCount").ToString());
+    Console.WriteLine(result[0].GetProperty("subgroupsWithOnLatestUpdateCount").ToString());
+    Console.WriteLine(result[0].GetProperty("deployments")[0].ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetBestUpdatesForGroupsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetBestUpdatesForGroupsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBestUpdatesForGroupsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetBestUpdatesForGroupsAsync("<groupId>"))
+await foreach (BinaryData item in client.GetBestUpdatesForGroupsAsync("<groupId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("deviceCount").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetBestUpdatesForGroupsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+await foreach (BinaryData item in client.GetBestUpdatesForGroupsAsync("<groupId>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetBestUpdatesForGroups(string,RequestContext)">
-<example>
-This sample shows how to call GetBestUpdatesForGroups with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBestUpdatesForGroups and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetBestUpdatesForGroups("<groupId>"))
+foreach (BinaryData item in client.GetBestUpdatesForGroups("<groupId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("deviceCount").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetBestUpdatesForGroups with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+foreach (BinaryData item in client.GetBestUpdatesForGroups("<groupId>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetDeploymentsForGroupsAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeploymentsForGroupsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeploymentsForGroupsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetDeploymentsForGroupsAsync("<groupId>"))
+await foreach (BinaryData item in client.GetDeploymentsForGroupsAsync("<groupId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deploymentId").ToString());
-    Console.WriteLine(result.GetProperty("startDateTime").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+    Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
 }
 ]]></code>
-This sample shows how to call GetDeploymentsForGroupsAsync with all parameters, and how to parse the result.
+This sample shows how to call GetDeploymentsForGroupsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetDeploymentsForGroupsAsync("<groupId>", "<orderBy>"))
+await foreach (BinaryData item in client.GetDeploymentsForGroupsAsync("<groupId>", orderBy: "<orderBy>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deploymentId").ToString());
-    Console.WriteLine(result.GetProperty("startDateTime").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassSubgroups")[0].ToString());
-    Console.WriteLine(result.GetProperty("isCanceled").ToString());
-    Console.WriteLine(result.GetProperty("isRetried").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
-    Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+    Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassSubgroups")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("isCanceled").ToString());
+    Console.WriteLine(result[0].GetProperty("isRetried").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("isCloudInitiatedRollback").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeploymentsForGroups(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeploymentsForGroups with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeploymentsForGroups and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetDeploymentsForGroups("<groupId>"))
+foreach (BinaryData item in client.GetDeploymentsForGroups("<groupId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deploymentId").ToString());
-    Console.WriteLine(result.GetProperty("startDateTime").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+    Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
 }
 ]]></code>
-This sample shows how to call GetDeploymentsForGroups with all parameters, and how to parse the result.
+This sample shows how to call GetDeploymentsForGroups with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetDeploymentsForGroups("<groupId>", "<orderBy>"))
+foreach (BinaryData item in client.GetDeploymentsForGroups("<groupId>", orderBy: "<orderBy>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deploymentId").ToString());
-    Console.WriteLine(result.GetProperty("startDateTime").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassSubgroups")[0].ToString());
-    Console.WriteLine(result.GetProperty("isCanceled").ToString());
-    Console.WriteLine(result.GetProperty("isRetried").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
-    Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+    Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassSubgroups")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("isCanceled").ToString());
+    Console.WriteLine(result[0].GetProperty("isRetried").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("isCloudInitiatedRollback").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeviceClassSubgroupsForGroupsAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceClassSubgroupsForGroupsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceClassSubgroupsForGroupsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetDeviceClassSubgroupsForGroupsAsync("<groupId>"))
+await foreach (BinaryData item in client.GetDeviceClassSubgroupsForGroupsAsync("<groupId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
 }
 ]]></code>
-This sample shows how to call GetDeviceClassSubgroupsForGroupsAsync with all parameters, and how to parse the result.
+This sample shows how to call GetDeviceClassSubgroupsForGroupsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetDeviceClassSubgroupsForGroupsAsync("<groupId>", "<filter>"))
+await foreach (BinaryData item in client.GetDeviceClassSubgroupsForGroupsAsync("<groupId>", filter: "<filter>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("deviceCount").ToString());
-    Console.WriteLine(result.GetProperty("deploymentId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeviceClassSubgroupsForGroups(string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceClassSubgroupsForGroups with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceClassSubgroupsForGroups and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetDeviceClassSubgroupsForGroups("<groupId>"))
+foreach (BinaryData item in client.GetDeviceClassSubgroupsForGroups("<groupId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
 }
 ]]></code>
-This sample shows how to call GetDeviceClassSubgroupsForGroups with all parameters, and how to parse the result.
+This sample shows how to call GetDeviceClassSubgroupsForGroups with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetDeviceClassSubgroupsForGroups("<groupId>", "<filter>"))
+foreach (BinaryData item in client.GetDeviceClassSubgroupsForGroups("<groupId>", filter: "<filter>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("deviceCount").ToString());
-    Console.WriteLine(result.GetProperty("deploymentId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeploymentsForDeviceClassSubgroupsAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeploymentsForDeviceClassSubgroupsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeploymentsForDeviceClassSubgroupsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetDeploymentsForDeviceClassSubgroupsAsync("<groupId>", "<deviceClassId>"))
+await foreach (BinaryData item in client.GetDeploymentsForDeviceClassSubgroupsAsync("<groupId>", "<deviceClassId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deploymentId").ToString());
-    Console.WriteLine(result.GetProperty("startDateTime").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+    Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
 }
 ]]></code>
-This sample shows how to call GetDeploymentsForDeviceClassSubgroupsAsync with all parameters, and how to parse the result.
+This sample shows how to call GetDeploymentsForDeviceClassSubgroupsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetDeploymentsForDeviceClassSubgroupsAsync("<groupId>", "<deviceClassId>", "<orderBy>"))
+await foreach (BinaryData item in client.GetDeploymentsForDeviceClassSubgroupsAsync("<groupId>", "<deviceClassId>", orderBy: "<orderBy>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deploymentId").ToString());
-    Console.WriteLine(result.GetProperty("startDateTime").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassSubgroups")[0].ToString());
-    Console.WriteLine(result.GetProperty("isCanceled").ToString());
-    Console.WriteLine(result.GetProperty("isRetried").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
-    Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+    Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassSubgroups")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("isCanceled").ToString());
+    Console.WriteLine(result[0].GetProperty("isRetried").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("isCloudInitiatedRollback").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeploymentsForDeviceClassSubgroups(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeploymentsForDeviceClassSubgroups with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeploymentsForDeviceClassSubgroups and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetDeploymentsForDeviceClassSubgroups("<groupId>", "<deviceClassId>"))
+foreach (BinaryData item in client.GetDeploymentsForDeviceClassSubgroups("<groupId>", "<deviceClassId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deploymentId").ToString());
-    Console.WriteLine(result.GetProperty("startDateTime").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+    Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
 }
 ]]></code>
-This sample shows how to call GetDeploymentsForDeviceClassSubgroups with all parameters, and how to parse the result.
+This sample shows how to call GetDeploymentsForDeviceClassSubgroups with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetDeploymentsForDeviceClassSubgroups("<groupId>", "<deviceClassId>", "<orderBy>"))
+foreach (BinaryData item in client.GetDeploymentsForDeviceClassSubgroups("<groupId>", "<deviceClassId>", orderBy: "<orderBy>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deploymentId").ToString());
-    Console.WriteLine(result.GetProperty("startDateTime").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("groupId").ToString());
-    Console.WriteLine(result.GetProperty("deviceClassSubgroups")[0].ToString());
-    Console.WriteLine(result.GetProperty("isCanceled").ToString());
-    Console.WriteLine(result.GetProperty("isRetried").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
-    Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
-    Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
+    Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+    Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("groupId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceClassSubgroups")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("isCanceled").ToString());
+    Console.WriteLine(result[0].GetProperty("isRetried").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
+    Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
+    Console.WriteLine(result[0].GetProperty("isCloudInitiatedRollback").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeviceStatesForDeviceClassSubgroupDeploymentsAsync(string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceStatesForDeviceClassSubgroupDeploymentsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceStatesForDeviceClassSubgroupDeploymentsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetDeviceStatesForDeviceClassSubgroupDeploymentsAsync("<groupId>", "<deviceClassId>", "<deploymentId>"))
+await foreach (BinaryData item in client.GetDeviceStatesForDeviceClassSubgroupDeploymentsAsync("<groupId>", "<deviceClassId>", "<deploymentId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceId").ToString());
-    Console.WriteLine(result.GetProperty("retryCount").ToString());
-    Console.WriteLine(result.GetProperty("movedOnToNewDeployment").ToString());
-    Console.WriteLine(result.GetProperty("deviceState").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("retryCount").ToString());
+    Console.WriteLine(result[0].GetProperty("movedOnToNewDeployment").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceState").ToString());
 }
 ]]></code>
-This sample shows how to call GetDeviceStatesForDeviceClassSubgroupDeploymentsAsync with all parameters, and how to parse the result.
+This sample shows how to call GetDeviceStatesForDeviceClassSubgroupDeploymentsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetDeviceStatesForDeviceClassSubgroupDeploymentsAsync("<groupId>", "<deviceClassId>", "<deploymentId>", "<filter>"))
+await foreach (BinaryData item in client.GetDeviceStatesForDeviceClassSubgroupDeploymentsAsync("<groupId>", "<deviceClassId>", "<deploymentId>", filter: "<filter>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceId").ToString());
-    Console.WriteLine(result.GetProperty("moduleId").ToString());
-    Console.WriteLine(result.GetProperty("retryCount").ToString());
-    Console.WriteLine(result.GetProperty("movedOnToNewDeployment").ToString());
-    Console.WriteLine(result.GetProperty("deviceState").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("moduleId").ToString());
+    Console.WriteLine(result[0].GetProperty("retryCount").ToString());
+    Console.WriteLine(result[0].GetProperty("movedOnToNewDeployment").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceState").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDeviceStatesForDeviceClassSubgroupDeployments(string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetDeviceStatesForDeviceClassSubgroupDeployments with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDeviceStatesForDeviceClassSubgroupDeployments and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetDeviceStatesForDeviceClassSubgroupDeployments("<groupId>", "<deviceClassId>", "<deploymentId>"))
+foreach (BinaryData item in client.GetDeviceStatesForDeviceClassSubgroupDeployments("<groupId>", "<deviceClassId>", "<deploymentId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceId").ToString());
-    Console.WriteLine(result.GetProperty("retryCount").ToString());
-    Console.WriteLine(result.GetProperty("movedOnToNewDeployment").ToString());
-    Console.WriteLine(result.GetProperty("deviceState").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("retryCount").ToString());
+    Console.WriteLine(result[0].GetProperty("movedOnToNewDeployment").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceState").ToString());
 }
 ]]></code>
-This sample shows how to call GetDeviceStatesForDeviceClassSubgroupDeployments with all parameters, and how to parse the result.
+This sample shows how to call GetDeviceStatesForDeviceClassSubgroupDeployments with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetDeviceStatesForDeviceClassSubgroupDeployments("<groupId>", "<deviceClassId>", "<deploymentId>", "<filter>"))
+foreach (BinaryData item in client.GetDeviceStatesForDeviceClassSubgroupDeployments("<groupId>", "<deviceClassId>", "<deploymentId>", filter: "<filter>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceId").ToString());
-    Console.WriteLine(result.GetProperty("moduleId").ToString());
-    Console.WriteLine(result.GetProperty("retryCount").ToString());
-    Console.WriteLine(result.GetProperty("movedOnToNewDeployment").ToString());
-    Console.WriteLine(result.GetProperty("deviceState").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("moduleId").ToString());
+    Console.WriteLine(result[0].GetProperty("retryCount").ToString());
+    Console.WriteLine(result[0].GetProperty("movedOnToNewDeployment").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceState").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetOperationStatusesAsync(string,int?,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetOperationStatusesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetOperationStatusesAsync())
+await foreach (BinaryData item in client.GetOperationStatusesAsync())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("operationId").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationId").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
 }
 ]]></code>
-This sample shows how to call GetOperationStatusesAsync with all parameters, and how to parse the result.
+This sample shows how to call GetOperationStatusesAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetOperationStatusesAsync("<filter>", 1234))
+await foreach (BinaryData item in client.GetOperationStatusesAsync(filter: "<filter>", top: 1234))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("operationId").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("occurredDateTime").ToString());
-    Console.WriteLine(result.GetProperty("traceId").ToString());
-    Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("etag").ToString());
+    Console.WriteLine(result[0].GetProperty("operationId").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("occurredDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("traceId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("etag").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetOperationStatuses(string,int?,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetOperationStatuses and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetOperationStatuses())
+foreach (BinaryData item in client.GetOperationStatuses())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("operationId").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationId").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
 }
 ]]></code>
-This sample shows how to call GetOperationStatuses with all parameters, and how to parse the result.
+This sample shows how to call GetOperationStatuses with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetOperationStatuses("<filter>", 1234))
+foreach (BinaryData item in client.GetOperationStatuses(filter: "<filter>", top: 1234))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("operationId").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("occurredDateTime").ToString());
-    Console.WriteLine(result.GetProperty("traceId").ToString());
-    Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("etag").ToString());
+    Console.WriteLine(result[0].GetProperty("operationId").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("occurredDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("traceId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("etag").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetLogCollectionsAsync(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetLogCollectionsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetLogCollectionsAsync())
+await foreach (BinaryData item in client.GetLogCollectionsAsync())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("operationId").ToString());
-    Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
-    Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("moduleId").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetLogCollectionsAsync with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+await foreach (BinaryData item in client.GetLogCollectionsAsync())
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("operationId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceList")[0].GetProperty("moduleId").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetLogCollections(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetLogCollections and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetLogCollections())
+foreach (BinaryData item in client.GetLogCollections())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("operationId").ToString());
-    Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
-    Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("moduleId").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetLogCollections with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+foreach (BinaryData item in client.GetLogCollections())
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("operationId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceList")[0].GetProperty("moduleId").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetHealthOfDevicesAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetHealthOfDevicesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetHealthOfDevicesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetHealthOfDevicesAsync("<filter>"))
+await foreach (BinaryData item in client.GetHealthOfDevicesAsync("<filter>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceId").ToString());
-    Console.WriteLine(result.GetProperty("moduleId").ToString());
-    Console.WriteLine(result.GetProperty("state").ToString());
-    Console.WriteLine(result.GetProperty("digitalTwinModelId").ToString());
-    Console.WriteLine(result.GetProperty("healthChecks")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("healthChecks")[0].GetProperty("result").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("state").ToString());
+    Console.WriteLine(result[0].GetProperty("healthChecks")[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetHealthOfDevicesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+await foreach (BinaryData item in client.GetHealthOfDevicesAsync("<filter>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("moduleId").ToString());
+    Console.WriteLine(result[0].GetProperty("state").ToString());
+    Console.WriteLine(result[0].GetProperty("digitalTwinModelId").ToString());
+    Console.WriteLine(result[0].GetProperty("healthChecks")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("healthChecks")[0].GetProperty("result").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetHealthOfDevices(string,RequestContext)">
-<example>
-This sample shows how to call GetHealthOfDevices with required parameters and parse the result.
+      <example>
+This sample shows how to call GetHealthOfDevices and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetHealthOfDevices("<filter>"))
+foreach (BinaryData item in client.GetHealthOfDevices("<filter>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("deviceId").ToString());
-    Console.WriteLine(result.GetProperty("moduleId").ToString());
-    Console.WriteLine(result.GetProperty("state").ToString());
-    Console.WriteLine(result.GetProperty("digitalTwinModelId").ToString());
-    Console.WriteLine(result.GetProperty("healthChecks")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("healthChecks")[0].GetProperty("result").ToString());
+    Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("state").ToString());
+    Console.WriteLine(result[0].GetProperty("healthChecks")[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetHealthOfDevices with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+foreach (BinaryData item in client.GetHealthOfDevices("<filter>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+    Console.WriteLine(result[0].GetProperty("moduleId").ToString());
+    Console.WriteLine(result[0].GetProperty("state").ToString());
+    Console.WriteLine(result[0].GetProperty("digitalTwinModelId").ToString());
+    Console.WriteLine(result[0].GetProperty("healthChecks")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("healthChecks")[0].GetProperty("result").ToString());
+}
+]]></code></example>
     </member>
     <member name="ImportDevicesAsync(WaitUntil,RequestContent,RequestContext)">
-<example>
-This sample shows how to call ImportDevicesAsync with required parameters and request content.
+      <example>
+This sample shows how to call ImportDevicesAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-var data = "Devices";
-
-var operation = await client.ImportDevicesAsync(WaitUntil.Completed, RequestContent.Create(data));
-
-Console.WriteLine(operation.GetRawResponse().Status);
+RequestContent content = RequestContent.Create("Devices");
+Operation operation = await client.ImportDevicesAsync(WaitUntil.Completed, content);
 ]]></code>
-</example>
+This sample shows how to call ImportDevicesAsync with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+RequestContent content = RequestContent.Create("Devices");
+Operation operation = await client.ImportDevicesAsync(WaitUntil.Completed, content);
+]]></code></example>
     </member>
     <member name="ImportDevices(WaitUntil,RequestContent,RequestContext)">
-<example>
-This sample shows how to call ImportDevices with required parameters and request content.
+      <example>
+This sample shows how to call ImportDevices.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-var data = "Devices";
-
-var operation = client.ImportDevices(WaitUntil.Completed, RequestContent.Create(data));
-
-Console.WriteLine(operation.GetRawResponse().Status);
+RequestContent content = RequestContent.Create("Devices");
+Operation operation = client.ImportDevices(WaitUntil.Completed, content);
 ]]></code>
-</example>
+This sample shows how to call ImportDevices with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
+
+RequestContent content = RequestContent.Create("Devices");
+Operation operation = client.ImportDevices(WaitUntil.Completed, content);
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/deviceupdate/Azure.IoT.DeviceUpdate/src/Generated/Docs/DeviceUpdateClient.xml b/sdk/deviceupdate/Azure.IoT.DeviceUpdate/src/Generated/Docs/DeviceUpdateClient.xml
index a7fe9c5eedf3..c8f9c39d08d2 100644
--- a/sdk/deviceupdate/Azure.IoT.DeviceUpdate/src/Generated/Docs/DeviceUpdateClient.xml
+++ b/sdk/deviceupdate/Azure.IoT.DeviceUpdate/src/Generated/Docs/DeviceUpdateClient.xml
@@ -2,12 +2,12 @@
 <doc>
   <members>
     <member name="GetUpdateAsync(string,string,string,ETag?,RequestContext)">
-<example>
-This sample shows how to call GetUpdateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetUpdateAsync("<provider>", "<name>", "<version>");
 
@@ -15,18 +15,18 @@ JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
 Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("manifestVersion").ToString());
 Console.WriteLine(result.GetProperty("importedDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 ]]></code>
-This sample shows how to call GetUpdateAsync with all parameters, and how to parse the result.
+This sample shows how to call GetUpdateAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-Response response = await client.GetUpdateAsync("<provider>", "<name>", "<version>", null);
+Response response = await client.GetUpdateAsync("<provider>", "<name>", "<version>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
@@ -37,7 +37,7 @@ Console.WriteLine(result.GetProperty("friendlyName").ToString());
 Console.WriteLine(result.GetProperty("isDeployable").ToString());
 Console.WriteLine(result.GetProperty("updateType").ToString());
 Console.WriteLine(result.GetProperty("installedCriteria").ToString());
-Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("handler").ToString());
@@ -54,16 +54,15 @@ Console.WriteLine(result.GetProperty("manifestVersion").ToString());
 Console.WriteLine(result.GetProperty("importedDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("etag").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetUpdate(string,string,string,ETag?,RequestContext)">
-<example>
-This sample shows how to call GetUpdate with required parameters and parse the result.
+      <example>
+This sample shows how to call GetUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetUpdate("<provider>", "<name>", "<version>");
 
@@ -71,18 +70,18 @@ JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
 Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("manifestVersion").ToString());
 Console.WriteLine(result.GetProperty("importedDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 ]]></code>
-This sample shows how to call GetUpdate with all parameters, and how to parse the result.
+This sample shows how to call GetUpdate with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-Response response = client.GetUpdate("<provider>", "<name>", "<version>", null);
+Response response = client.GetUpdate("<provider>", "<name>", "<version>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
@@ -93,7 +92,7 @@ Console.WriteLine(result.GetProperty("friendlyName").ToString());
 Console.WriteLine(result.GetProperty("isDeployable").ToString());
 Console.WriteLine(result.GetProperty("updateType").ToString());
 Console.WriteLine(result.GetProperty("installedCriteria").ToString());
-Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("handler").ToString());
@@ -110,16 +109,15 @@ Console.WriteLine(result.GetProperty("manifestVersion").ToString());
 Console.WriteLine(result.GetProperty("importedDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("etag").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetFileAsync(string,string,string,string,ETag?,RequestContext)">
-<example>
-This sample shows how to call GetFileAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFileAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetFileAsync("<provider>", "<name>", "<version>", "<fileId>");
 
@@ -127,44 +125,43 @@ JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("fileId").ToString());
 Console.WriteLine(result.GetProperty("fileName").ToString());
 Console.WriteLine(result.GetProperty("sizeInBytes").ToString());
-Console.WriteLine(result.GetProperty("hashes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("hashes").GetProperty("<key>").ToString());
 ]]></code>
-This sample shows how to call GetFileAsync with all parameters, and how to parse the result.
+This sample shows how to call GetFileAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-Response response = await client.GetFileAsync("<provider>", "<name>", "<version>", "<fileId>", null);
+Response response = await client.GetFileAsync("<provider>", "<name>", "<version>", "<fileId>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("fileId").ToString());
 Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("fileName").ToString());
 Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("sizeInBytes").ToString());
-Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("hashes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("hashes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("mimeType").ToString());
 Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("scanResult").ToString());
 Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("scanDetails").ToString());
-Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("properties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("properties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("downloadHandler").GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("etag").ToString());
 Console.WriteLine(result.GetProperty("fileName").ToString());
 Console.WriteLine(result.GetProperty("sizeInBytes").ToString());
-Console.WriteLine(result.GetProperty("hashes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("hashes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("mimeType").ToString());
 Console.WriteLine(result.GetProperty("scanResult").ToString());
 Console.WriteLine(result.GetProperty("scanDetails").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetFile(string,string,string,string,ETag?,RequestContext)">
-<example>
-This sample shows how to call GetFile with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFile and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetFile("<provider>", "<name>", "<version>", "<fileId>");
 
@@ -172,44 +169,43 @@ JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("fileId").ToString());
 Console.WriteLine(result.GetProperty("fileName").ToString());
 Console.WriteLine(result.GetProperty("sizeInBytes").ToString());
-Console.WriteLine(result.GetProperty("hashes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("hashes").GetProperty("<key>").ToString());
 ]]></code>
-This sample shows how to call GetFile with all parameters, and how to parse the result.
+This sample shows how to call GetFile with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-Response response = client.GetFile("<provider>", "<name>", "<version>", "<fileId>", null);
+Response response = client.GetFile("<provider>", "<name>", "<version>", "<fileId>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("fileId").ToString());
 Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("fileName").ToString());
 Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("sizeInBytes").ToString());
-Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("hashes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("hashes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("mimeType").ToString());
 Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("scanResult").ToString());
 Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("scanDetails").ToString());
-Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("properties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("properties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("downloadHandler").GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("etag").ToString());
 Console.WriteLine(result.GetProperty("fileName").ToString());
 Console.WriteLine(result.GetProperty("sizeInBytes").ToString());
-Console.WriteLine(result.GetProperty("hashes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("hashes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("mimeType").ToString());
 Console.WriteLine(result.GetProperty("scanResult").ToString());
 Console.WriteLine(result.GetProperty("scanDetails").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetOperationStatusAsync(string,ETag?,RequestContext)">
-<example>
-This sample shows how to call GetOperationStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetOperationStatusAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
 Response response = await client.GetOperationStatusAsync("<operationId>");
 
@@ -219,13 +215,13 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 ]]></code>
-This sample shows how to call GetOperationStatusAsync with all parameters, and how to parse the result.
+This sample shows how to call GetOperationStatusAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-Response response = await client.GetOperationStatusAsync("<operationId>", null);
+Response response = await client.GetOperationStatusAsync("<operationId>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("operationId").ToString());
@@ -247,16 +243,15 @@ Console.WriteLine(result.GetProperty("traceId").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("etag").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetOperationStatus(string,ETag?,RequestContext)">
-<example>
-This sample shows how to call GetOperationStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetOperationStatus and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
 Response response = client.GetOperationStatus("<operationId>");
 
@@ -266,13 +261,13 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 ]]></code>
-This sample shows how to call GetOperationStatus with all parameters, and how to parse the result.
+This sample shows how to call GetOperationStatus with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-Response response = client.GetOperationStatus("<operationId>", null);
+Response response = client.GetOperationStatus("<operationId>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("operationId").ToString());
@@ -294,468 +289,587 @@ Console.WriteLine(result.GetProperty("traceId").ToString());
 Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("etag").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetUpdatesAsync(string,string,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetUpdatesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetUpdatesAsync())
+await foreach (BinaryData item in client.GetUpdatesAsync())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("manifestVersion").ToString());
-    Console.WriteLine(result.GetProperty("importedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("compatibility")[0].GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("manifestVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("importedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
 }
 ]]></code>
-This sample shows how to call GetUpdatesAsync with all parameters, and how to parse the result.
+This sample shows how to call GetUpdatesAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetUpdatesAsync("<search>", "<filter>"))
+await foreach (BinaryData item in client.GetUpdatesAsync(search: "<search>", filter: "<filter>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("isDeployable").ToString());
-    Console.WriteLine(result.GetProperty("updateType").ToString());
-    Console.WriteLine(result.GetProperty("installedCriteria").ToString());
-    Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("handler").ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("handlerProperties").ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("files")[0].ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("referencedBy")[0].GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("referencedBy")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("referencedBy")[0].GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("scanResult").ToString());
-    Console.WriteLine(result.GetProperty("manifestVersion").ToString());
-    Console.WriteLine(result.GetProperty("importedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("etag").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("isDeployable").ToString());
+    Console.WriteLine(result[0].GetProperty("updateType").ToString());
+    Console.WriteLine(result[0].GetProperty("installedCriteria").ToString());
+    Console.WriteLine(result[0].GetProperty("compatibility")[0].GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("handler").ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("handlerProperties").ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("files")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("referencedBy")[0].GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("referencedBy")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("referencedBy")[0].GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResult").ToString());
+    Console.WriteLine(result[0].GetProperty("manifestVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("importedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("etag").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetUpdates(string,string,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetUpdates and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetUpdates())
+foreach (BinaryData item in client.GetUpdates())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("manifestVersion").ToString());
-    Console.WriteLine(result.GetProperty("importedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("compatibility")[0].GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("manifestVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("importedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
 }
 ]]></code>
-This sample shows how to call GetUpdates with all parameters, and how to parse the result.
+This sample shows how to call GetUpdates with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetUpdates("<search>", "<filter>"))
+foreach (BinaryData item in client.GetUpdates(search: "<search>", filter: "<filter>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("isDeployable").ToString());
-    Console.WriteLine(result.GetProperty("updateType").ToString());
-    Console.WriteLine(result.GetProperty("installedCriteria").ToString());
-    Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("handler").ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("handlerProperties").ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("files")[0].ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("referencedBy")[0].GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("referencedBy")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("referencedBy")[0].GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("scanResult").ToString());
-    Console.WriteLine(result.GetProperty("manifestVersion").ToString());
-    Console.WriteLine(result.GetProperty("importedDateTime").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("etag").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("isDeployable").ToString());
+    Console.WriteLine(result[0].GetProperty("updateType").ToString());
+    Console.WriteLine(result[0].GetProperty("installedCriteria").ToString());
+    Console.WriteLine(result[0].GetProperty("compatibility")[0].GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("handler").ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("handlerProperties").ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("files")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("referencedBy")[0].GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("referencedBy")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("referencedBy")[0].GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResult").ToString());
+    Console.WriteLine(result[0].GetProperty("manifestVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("importedDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("etag").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetProvidersAsync(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetProvidersAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetProvidersAsync())
+await foreach (BinaryData item in client.GetProvidersAsync())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetProvidersAsync with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
+
+await foreach (BinaryData item in client.GetProvidersAsync())
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].ToString());
+}
+]]></code></example>
     </member>
     <member name="GetProviders(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetProviders and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetProviders())
+foreach (BinaryData item in client.GetProviders())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetProviders with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
+
+foreach (BinaryData item in client.GetProviders())
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].ToString());
+}
+]]></code></example>
     </member>
     <member name="GetNamesAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetNamesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetNamesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetNamesAsync("<provider>"))
+await foreach (BinaryData item in client.GetNamesAsync("<provider>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetNamesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
+
+await foreach (BinaryData item in client.GetNamesAsync("<provider>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].ToString());
+}
+]]></code></example>
     </member>
     <member name="GetNames(string,RequestContext)">
-<example>
-This sample shows how to call GetNames with required parameters and parse the result.
+      <example>
+This sample shows how to call GetNames and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetNames("<provider>"))
+foreach (BinaryData item in client.GetNames("<provider>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetNames with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
+
+foreach (BinaryData item in client.GetNames("<provider>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].ToString());
+}
+]]></code></example>
     </member>
     <member name="GetVersionsAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetVersionsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetVersionsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetVersionsAsync("<provider>", "<name>"))
+await foreach (BinaryData item in client.GetVersionsAsync("<provider>", "<name>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-This sample shows how to call GetVersionsAsync with all parameters, and how to parse the result.
+This sample shows how to call GetVersionsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetVersionsAsync("<provider>", "<name>", "<filter>"))
+await foreach (BinaryData item in client.GetVersionsAsync("<provider>", "<name>", filter: "<filter>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetVersions(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetVersions with required parameters and parse the result.
+      <example>
+This sample shows how to call GetVersions and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetVersions("<provider>", "<name>"))
+foreach (BinaryData item in client.GetVersions("<provider>", "<name>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-This sample shows how to call GetVersions with all parameters, and how to parse the result.
+This sample shows how to call GetVersions with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetVersions("<provider>", "<name>", "<filter>"))
+foreach (BinaryData item in client.GetVersions("<provider>", "<name>", filter: "<filter>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetFilesAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetFilesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFilesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetFilesAsync("<provider>", "<name>", "<version>"))
+await foreach (BinaryData item in client.GetFilesAsync("<provider>", "<name>", "<version>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetFilesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
+
+await foreach (BinaryData item in client.GetFilesAsync("<provider>", "<name>", "<version>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].ToString());
+}
+]]></code></example>
     </member>
     <member name="GetFiles(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetFiles with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFiles and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetFiles("<provider>", "<name>", "<version>"))
+foreach (BinaryData item in client.GetFiles("<provider>", "<name>", "<version>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetFiles with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
+
+foreach (BinaryData item in client.GetFiles("<provider>", "<name>", "<version>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].ToString());
+}
+]]></code></example>
     </member>
     <member name="GetOperationStatusesAsync(string,int?,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetOperationStatusesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetOperationStatusesAsync())
+await foreach (BinaryData item in client.GetOperationStatusesAsync())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("operationId").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationId").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
 }
 ]]></code>
-This sample shows how to call GetOperationStatusesAsync with all parameters, and how to parse the result.
+This sample shows how to call GetOperationStatusesAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-await foreach (var item in client.GetOperationStatusesAsync("<filter>", 1234))
+await foreach (BinaryData item in client.GetOperationStatusesAsync(filter: "<filter>", top: 1234))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("operationId").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("resourceLocation").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("occurredDateTime").ToString());
-    Console.WriteLine(result.GetProperty("traceId").ToString());
-    Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("etag").ToString());
+    Console.WriteLine(result[0].GetProperty("operationId").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceLocation").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("occurredDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("traceId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("etag").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetOperationStatuses(string,int?,RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetOperationStatuses and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetOperationStatuses())
+foreach (BinaryData item in client.GetOperationStatuses())
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("operationId").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("operationId").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
 }
 ]]></code>
-This sample shows how to call GetOperationStatuses with all parameters, and how to parse the result.
+This sample shows how to call GetOperationStatuses with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-foreach (var item in client.GetOperationStatuses("<filter>", 1234))
+foreach (BinaryData item in client.GetOperationStatuses(filter: "<filter>", top: 1234))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("operationId").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("resourceLocation").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("occurredDateTime").ToString());
-    Console.WriteLine(result.GetProperty("traceId").ToString());
-    Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-    Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-    Console.WriteLine(result.GetProperty("etag").ToString());
+    Console.WriteLine(result[0].GetProperty("operationId").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceLocation").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("occurredDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("traceId").ToString());
+    Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("etag").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteUpdateAsync(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteUpdateAsync with required parameters.
+      <example>
+This sample shows how to call DeleteUpdateAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
-
-var operation = await client.DeleteUpdateAsync(WaitUntil.Completed, "<provider>", "<name>", "<version>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = await client.DeleteUpdateAsync(WaitUntil.Completed, "<provider>", "<name>", "<version>");
 ]]></code>
-</example>
+This sample shows how to call DeleteUpdateAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
+
+Operation operation = await client.DeleteUpdateAsync(WaitUntil.Completed, "<provider>", "<name>", "<version>");
+]]></code></example>
     </member>
     <member name="DeleteUpdate(WaitUntil,string,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteUpdate with required parameters.
+      <example>
+This sample shows how to call DeleteUpdate.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
-
-var operation = client.DeleteUpdate(WaitUntil.Completed, "<provider>", "<name>", "<version>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-Console.WriteLine(operation.GetRawResponse().Status);
+Operation operation = client.DeleteUpdate(WaitUntil.Completed, "<provider>", "<name>", "<version>");
 ]]></code>
-</example>
+This sample shows how to call DeleteUpdate with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
+
+Operation operation = client.DeleteUpdate(WaitUntil.Completed, "<provider>", "<name>", "<version>");
+]]></code></example>
     </member>
     <member name="StartImportUpdateAsync(WaitUntil,RequestContent,RequestContext)">
-<example>
-This sample shows how to call StartImportUpdateAsync with required parameters and request content.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
-
-var data = new[] {
-    new {
-        importManifest = new {
-            url = "<url>",
-            sizeInBytes = 1234L,
-            hashes = new {
-                key = "<String>",
-            },
-        },
-        friendlyName = "<friendlyName>",
-        files = new[] {
-            new {
-                filename = "<filename>",
-                url = "<url>",
-            }
-        },
-    }
-};
-
-var operation = await client.StartImportUpdateAsync(WaitUntil.Completed, RequestContent.Create(data));
-
-Console.WriteLine(operation.GetRawResponse().Status);
+      <example>
+This sample shows how to call StartImportUpdateAsync.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["importManifest"] = new Dictionary<string, object>()
+{
+["url"] = "<url>",
+["sizeInBytes"] = 1234L,
+["hashes"] = new Dictionary<string, object>()
+{
+["key"] = "<hashes>",
+},
+},
+}
+});
+Operation operation = await client.StartImportUpdateAsync(WaitUntil.Completed, content);
 ]]></code>
-</example>
+This sample shows how to call StartImportUpdateAsync with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["importManifest"] = new Dictionary<string, object>()
+{
+["url"] = "<url>",
+["sizeInBytes"] = 1234L,
+["hashes"] = new Dictionary<string, object>()
+{
+["key"] = "<hashes>",
+},
+},
+["friendlyName"] = "<friendlyName>",
+["files"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["filename"] = "<filename>",
+["url"] = "<url>",
+}
+},
+}
+});
+Operation operation = await client.StartImportUpdateAsync(WaitUntil.Completed, content);
+]]></code></example>
     </member>
     <member name="StartImportUpdate(WaitUntil,RequestContent,RequestContext)">
-<example>
-This sample shows how to call StartImportUpdate with required parameters and request content.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
-
-var data = new[] {
-    new {
-        importManifest = new {
-            url = "<url>",
-            sizeInBytes = 1234L,
-            hashes = new {
-                key = "<String>",
-            },
-        },
-        friendlyName = "<friendlyName>",
-        files = new[] {
-            new {
-                filename = "<filename>",
-                url = "<url>",
-            }
-        },
-    }
-};
-
-var operation = client.StartImportUpdate(WaitUntil.Completed, RequestContent.Create(data));
-
-Console.WriteLine(operation.GetRawResponse().Status);
+      <example>
+This sample shows how to call StartImportUpdate.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["importManifest"] = new Dictionary<string, object>()
+{
+["url"] = "<url>",
+["sizeInBytes"] = 1234L,
+["hashes"] = new Dictionary<string, object>()
+{
+["key"] = "<hashes>",
+},
+},
+}
+});
+Operation operation = client.StartImportUpdate(WaitUntil.Completed, content);
 ]]></code>
-</example>
+This sample shows how to call StartImportUpdate with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["importManifest"] = new Dictionary<string, object>()
+{
+["url"] = "<url>",
+["sizeInBytes"] = 1234L,
+["hashes"] = new Dictionary<string, object>()
+{
+["key"] = "<hashes>",
+},
+},
+["friendlyName"] = "<friendlyName>",
+["files"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["filename"] = "<filename>",
+["url"] = "<url>",
+}
+},
+}
+});
+Operation operation = client.StartImportUpdate(WaitUntil.Completed, content);
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/deviceupdate/Azure.IoT.DeviceUpdate/tests/Generated/Samples/Samples_DeviceManagementClient.cs b/sdk/deviceupdate/Azure.IoT.DeviceUpdate/tests/Generated/Samples/Samples_DeviceManagementClient.cs
index bb55a61f73a4..7cf897028404 100644
--- a/sdk/deviceupdate/Azure.IoT.DeviceUpdate/tests/Generated/Samples/Samples_DeviceManagementClient.cs
+++ b/sdk/deviceupdate/Azure.IoT.DeviceUpdate/tests/Generated/Samples/Samples_DeviceManagementClient.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.IoT.DeviceUpdate;
 using NUnit.Framework;
 
 namespace Azure.IoT.DeviceUpdate.Samples
@@ -23,24 +23,24 @@ public class Samples_DeviceManagementClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceClass()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeviceClass("<deviceClassId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceClass_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeviceClass("<deviceClassId>");
 
@@ -49,7 +49,7 @@ public void Example_GetDeviceClass_AllParameters()
             Console.WriteLine(result.GetProperty("friendlyName").ToString());
             Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
             Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
             Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
@@ -61,24 +61,24 @@ public void Example_GetDeviceClass_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceClass_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeviceClassAsync("<deviceClassId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceClass_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeviceClassAsync("<deviceClassId>");
 
@@ -87,7 +87,7 @@ public async Task Example_GetDeviceClass_AllParameters_Async()
             Console.WriteLine(result.GetProperty("friendlyName").ToString());
             Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
             Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
             Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
@@ -99,43 +99,41 @@ public async Task Example_GetDeviceClass_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateDeviceClass()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                friendlyName = "<friendlyName>",
-            };
-
-            Response response = client.UpdateDeviceClass("<deviceClassId>", RequestContent.Create(data));
+                ["friendlyName"] = "<friendlyName>",
+            });
+            Response response = client.UpdateDeviceClass("<deviceClassId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateDeviceClass_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                friendlyName = "<friendlyName>",
-            };
-
-            Response response = client.UpdateDeviceClass("<deviceClassId>", RequestContent.Create(data));
+                ["friendlyName"] = "<friendlyName>",
+            });
+            Response response = client.UpdateDeviceClass("<deviceClassId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deviceClassId").ToString());
             Console.WriteLine(result.GetProperty("friendlyName").ToString());
             Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
             Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
             Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
@@ -147,43 +145,41 @@ public void Example_UpdateDeviceClass_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateDeviceClass_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                friendlyName = "<friendlyName>",
-            };
-
-            Response response = await client.UpdateDeviceClassAsync("<deviceClassId>", RequestContent.Create(data));
+                ["friendlyName"] = "<friendlyName>",
+            });
+            Response response = await client.UpdateDeviceClassAsync("<deviceClassId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateDeviceClass_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                friendlyName = "<friendlyName>",
-            };
-
-            Response response = await client.UpdateDeviceClassAsync("<deviceClassId>", RequestContent.Create(data));
+                ["friendlyName"] = "<friendlyName>",
+            });
+            Response response = await client.UpdateDeviceClassAsync("<deviceClassId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deviceClassId").ToString());
             Console.WriteLine(result.GetProperty("friendlyName").ToString());
             Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
             Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
             Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
@@ -195,9 +191,9 @@ public async Task Example_UpdateDeviceClass_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteDeviceClass()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.DeleteDeviceClass("<deviceClassId>");
             Console.WriteLine(response.Status);
@@ -207,9 +203,9 @@ public void Example_DeleteDeviceClass()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteDeviceClass_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.DeleteDeviceClass("<deviceClassId>");
             Console.WriteLine(response.Status);
@@ -219,9 +215,9 @@ public void Example_DeleteDeviceClass_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteDeviceClass_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.DeleteDeviceClassAsync("<deviceClassId>");
             Console.WriteLine(response.Status);
@@ -231,9 +227,9 @@ public async Task Example_DeleteDeviceClass_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteDeviceClass_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.DeleteDeviceClassAsync("<deviceClassId>");
             Console.WriteLine(response.Status);
@@ -243,9 +239,9 @@ public async Task Example_DeleteDeviceClass_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDevice()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDevice("<deviceId>");
 
@@ -259,9 +255,9 @@ public void Example_GetDevice()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDevice_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDevice("<deviceId>");
 
@@ -301,9 +297,9 @@ public void Example_GetDevice_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDevice_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeviceAsync("<deviceId>");
 
@@ -317,9 +313,9 @@ public async Task Example_GetDevice_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDevice_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeviceAsync("<deviceId>");
 
@@ -359,9 +355,9 @@ public async Task Example_GetDevice_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceModule()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeviceModule("<deviceId>", "<moduleId>");
 
@@ -375,9 +371,9 @@ public void Example_GetDeviceModule()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceModule_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeviceModule("<deviceId>", "<moduleId>");
 
@@ -417,9 +413,9 @@ public void Example_GetDeviceModule_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceModule_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeviceModuleAsync("<deviceId>", "<moduleId>");
 
@@ -433,9 +429,9 @@ public async Task Example_GetDeviceModule_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceModule_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeviceModuleAsync("<deviceId>", "<moduleId>");
 
@@ -475,9 +471,9 @@ public async Task Example_GetDeviceModule_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpdateCompliance()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetUpdateCompliance();
 
@@ -492,9 +488,9 @@ public void Example_GetUpdateCompliance()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpdateCompliance_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetUpdateCompliance();
 
@@ -509,9 +505,9 @@ public void Example_GetUpdateCompliance_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpdateCompliance_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetUpdateComplianceAsync();
 
@@ -526,9 +522,9 @@ public async Task Example_GetUpdateCompliance_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpdateCompliance_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetUpdateComplianceAsync();
 
@@ -543,9 +539,9 @@ public async Task Example_GetUpdateCompliance_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGroup()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetGroup("<groupId>");
 
@@ -559,9 +555,9 @@ public void Example_GetGroup()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGroup_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetGroup("<groupId>");
 
@@ -580,9 +576,9 @@ public void Example_GetGroup_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGroup_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetGroupAsync("<groupId>");
 
@@ -596,9 +592,9 @@ public async Task Example_GetGroup_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGroup_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetGroupAsync("<groupId>");
 
@@ -617,9 +613,9 @@ public async Task Example_GetGroup_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteGroup()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.DeleteGroup("<groupId>");
             Console.WriteLine(response.Status);
@@ -629,9 +625,9 @@ public void Example_DeleteGroup()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteGroup_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.DeleteGroup("<groupId>");
             Console.WriteLine(response.Status);
@@ -641,9 +637,9 @@ public void Example_DeleteGroup_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteGroup_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.DeleteGroupAsync("<groupId>");
             Console.WriteLine(response.Status);
@@ -653,9 +649,9 @@ public async Task Example_DeleteGroup_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteGroup_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.DeleteGroupAsync("<groupId>");
             Console.WriteLine(response.Status);
@@ -665,9 +661,9 @@ public async Task Example_DeleteGroup_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpdateComplianceForGroup()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetUpdateComplianceForGroup("<groupId>");
 
@@ -682,9 +678,9 @@ public void Example_GetUpdateComplianceForGroup()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpdateComplianceForGroup_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetUpdateComplianceForGroup("<groupId>");
 
@@ -699,9 +695,9 @@ public void Example_GetUpdateComplianceForGroup_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpdateComplianceForGroup_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetUpdateComplianceForGroupAsync("<groupId>");
 
@@ -716,9 +712,9 @@ public async Task Example_GetUpdateComplianceForGroup_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpdateComplianceForGroup_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetUpdateComplianceForGroupAsync("<groupId>");
 
@@ -733,9 +729,9 @@ public async Task Example_GetUpdateComplianceForGroup_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeployment()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeployment("<groupId>", "<deploymentId>");
 
@@ -752,9 +748,9 @@ public void Example_GetDeployment()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeployment_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeployment("<groupId>", "<deploymentId>");
 
@@ -784,9 +780,9 @@ public void Example_GetDeployment_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeployment_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeploymentAsync("<groupId>", "<deploymentId>");
 
@@ -803,9 +799,9 @@ public async Task Example_GetDeployment_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeployment_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeploymentAsync("<groupId>", "<deploymentId>");
 
@@ -835,27 +831,26 @@ public async Task Example_GetDeployment_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateDeployment()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                deploymentId = "<deploymentId>",
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                update = new
+                ["deploymentId"] = "<deploymentId>",
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["update"] = new Dictionary<string, object>()
                 {
-                    updateId = new
+                    ["updateId"] = new Dictionary<string, object>()
                     {
-                        provider = "<provider>",
-                        name = "<name>",
-                        version = "<version>",
+                        ["provider"] = "<provider>",
+                        ["name"] = "<name>",
+                        ["version"] = "<version>",
                     },
                 },
-                groupId = "<groupId>",
-            };
-
-            Response response = client.CreateOrUpdateDeployment("<groupId>", "<deploymentId>", RequestContent.Create(data));
+                ["groupId"] = "<groupId>",
+            });
+            Response response = client.CreateOrUpdateDeployment("<groupId>", "<deploymentId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deploymentId").ToString());
@@ -870,50 +865,43 @@ public void Example_CreateOrUpdateDeployment()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateDeployment_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                deploymentId = "<deploymentId>",
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                update = new
+                ["deploymentId"] = "<deploymentId>",
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["update"] = new Dictionary<string, object>()
                 {
-                    updateId = new
+                    ["updateId"] = new Dictionary<string, object>()
                     {
-                        provider = "<provider>",
-                        name = "<name>",
-                        version = "<version>",
+                        ["provider"] = "<provider>",
+                        ["name"] = "<name>",
+                        ["version"] = "<version>",
                     },
                 },
-                groupId = "<groupId>",
-                deviceClassSubgroups = new[] {
-        "<String>"
-    },
-                isCanceled = true,
-                isRetried = true,
-                rollbackPolicy = new
+                ["groupId"] = "<groupId>",
+                ["deviceClassSubgroups"] = new List<object>()
+{
+"<deviceClassSubgroups>"
+},
+                ["isCanceled"] = true,
+                ["isRetried"] = true,
+                ["rollbackPolicy"] = new Dictionary<string, object>()
                 {
-                    update = new
+                    ["update"] = null
+            ,
+                    ["failure"] = new Dictionary<string, object>()
                     {
-                        updateId = new
-                        {
-                            provider = "<provider>",
-                            name = "<name>",
-                            version = "<version>",
-                        },
-                    },
-                    failure = new
-                    {
-                        devicesFailedPercentage = 1234,
-                        devicesFailedCount = 1234,
+                        ["devicesFailedPercentage"] = 1234,
+                        ["devicesFailedCount"] = 1234,
                     },
                 },
-                isCloudInitiatedRollback = true,
-            };
-
-            Response response = client.CreateOrUpdateDeployment("<groupId>", "<deploymentId>", RequestContent.Create(data));
+                ["isCloudInitiatedRollback"] = true,
+            });
+            Response response = client.CreateOrUpdateDeployment("<groupId>", "<deploymentId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deploymentId").ToString());
@@ -941,27 +929,26 @@ public void Example_CreateOrUpdateDeployment_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateDeployment_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                deploymentId = "<deploymentId>",
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                update = new
+                ["deploymentId"] = "<deploymentId>",
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["update"] = new Dictionary<string, object>()
                 {
-                    updateId = new
+                    ["updateId"] = new Dictionary<string, object>()
                     {
-                        provider = "<provider>",
-                        name = "<name>",
-                        version = "<version>",
+                        ["provider"] = "<provider>",
+                        ["name"] = "<name>",
+                        ["version"] = "<version>",
                     },
                 },
-                groupId = "<groupId>",
-            };
-
-            Response response = await client.CreateOrUpdateDeploymentAsync("<groupId>", "<deploymentId>", RequestContent.Create(data));
+                ["groupId"] = "<groupId>",
+            });
+            Response response = await client.CreateOrUpdateDeploymentAsync("<groupId>", "<deploymentId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deploymentId").ToString());
@@ -976,50 +963,43 @@ public async Task Example_CreateOrUpdateDeployment_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateDeployment_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                deploymentId = "<deploymentId>",
-                startDateTime = "2022-05-10T18:57:31.2311892Z",
-                update = new
+                ["deploymentId"] = "<deploymentId>",
+                ["startDateTime"] = "2022-05-10T18:57:31.2311892Z",
+                ["update"] = new Dictionary<string, object>()
                 {
-                    updateId = new
+                    ["updateId"] = new Dictionary<string, object>()
                     {
-                        provider = "<provider>",
-                        name = "<name>",
-                        version = "<version>",
+                        ["provider"] = "<provider>",
+                        ["name"] = "<name>",
+                        ["version"] = "<version>",
                     },
                 },
-                groupId = "<groupId>",
-                deviceClassSubgroups = new[] {
-        "<String>"
-    },
-                isCanceled = true,
-                isRetried = true,
-                rollbackPolicy = new
+                ["groupId"] = "<groupId>",
+                ["deviceClassSubgroups"] = new List<object>()
+{
+"<deviceClassSubgroups>"
+},
+                ["isCanceled"] = true,
+                ["isRetried"] = true,
+                ["rollbackPolicy"] = new Dictionary<string, object>()
                 {
-                    update = new
+                    ["update"] = null
+            ,
+                    ["failure"] = new Dictionary<string, object>()
                     {
-                        updateId = new
-                        {
-                            provider = "<provider>",
-                            name = "<name>",
-                            version = "<version>",
-                        },
-                    },
-                    failure = new
-                    {
-                        devicesFailedPercentage = 1234,
-                        devicesFailedCount = 1234,
+                        ["devicesFailedPercentage"] = 1234,
+                        ["devicesFailedCount"] = 1234,
                     },
                 },
-                isCloudInitiatedRollback = true,
-            };
-
-            Response response = await client.CreateOrUpdateDeploymentAsync("<groupId>", "<deploymentId>", RequestContent.Create(data));
+                ["isCloudInitiatedRollback"] = true,
+            });
+            Response response = await client.CreateOrUpdateDeploymentAsync("<groupId>", "<deploymentId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deploymentId").ToString());
@@ -1047,9 +1027,9 @@ public async Task Example_CreateOrUpdateDeployment_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteDeployment()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.DeleteDeployment("<groupId>", "<deploymentId>");
             Console.WriteLine(response.Status);
@@ -1059,9 +1039,9 @@ public void Example_DeleteDeployment()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteDeployment_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.DeleteDeployment("<groupId>", "<deploymentId>");
             Console.WriteLine(response.Status);
@@ -1071,9 +1051,9 @@ public void Example_DeleteDeployment_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteDeployment_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.DeleteDeploymentAsync("<groupId>", "<deploymentId>");
             Console.WriteLine(response.Status);
@@ -1083,9 +1063,9 @@ public async Task Example_DeleteDeployment_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteDeployment_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.DeleteDeploymentAsync("<groupId>", "<deploymentId>");
             Console.WriteLine(response.Status);
@@ -1095,9 +1075,9 @@ public async Task Example_DeleteDeployment_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeploymentStatus()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeploymentStatus("<groupId>", "<deploymentId>");
 
@@ -1113,9 +1093,9 @@ public void Example_GetDeploymentStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeploymentStatus_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeploymentStatus("<groupId>", "<deploymentId>");
 
@@ -1150,9 +1130,9 @@ public void Example_GetDeploymentStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeploymentStatus_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeploymentStatusAsync("<groupId>", "<deploymentId>");
 
@@ -1168,9 +1148,9 @@ public async Task Example_GetDeploymentStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeploymentStatus_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeploymentStatusAsync("<groupId>", "<deploymentId>");
 
@@ -1205,9 +1185,9 @@ public async Task Example_GetDeploymentStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceClassSubgroup()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeviceClassSubgroup("<groupId>", "<deviceClassId>");
 
@@ -1221,9 +1201,9 @@ public void Example_GetDeviceClassSubgroup()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceClassSubgroup_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeviceClassSubgroup("<groupId>", "<deviceClassId>");
 
@@ -1239,9 +1219,9 @@ public void Example_GetDeviceClassSubgroup_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceClassSubgroup_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>");
 
@@ -1255,9 +1235,9 @@ public async Task Example_GetDeviceClassSubgroup_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceClassSubgroup_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>");
 
@@ -1273,9 +1253,9 @@ public async Task Example_GetDeviceClassSubgroup_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteDeviceClassSubgroup()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.DeleteDeviceClassSubgroup("<groupId>", "<deviceClassId>");
             Console.WriteLine(response.Status);
@@ -1285,9 +1265,9 @@ public void Example_DeleteDeviceClassSubgroup()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteDeviceClassSubgroup_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.DeleteDeviceClassSubgroup("<groupId>", "<deviceClassId>");
             Console.WriteLine(response.Status);
@@ -1297,9 +1277,9 @@ public void Example_DeleteDeviceClassSubgroup_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteDeviceClassSubgroup_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.DeleteDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>");
             Console.WriteLine(response.Status);
@@ -1309,9 +1289,9 @@ public async Task Example_DeleteDeviceClassSubgroup_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteDeviceClassSubgroup_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.DeleteDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>");
             Console.WriteLine(response.Status);
@@ -1321,9 +1301,9 @@ public async Task Example_DeleteDeviceClassSubgroup_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceClassSubgroupUpdateCompliance()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeviceClassSubgroupUpdateCompliance("<groupId>", "<deviceClassId>");
 
@@ -1338,9 +1318,9 @@ public void Example_GetDeviceClassSubgroupUpdateCompliance()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceClassSubgroupUpdateCompliance_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeviceClassSubgroupUpdateCompliance("<groupId>", "<deviceClassId>");
 
@@ -1355,9 +1335,9 @@ public void Example_GetDeviceClassSubgroupUpdateCompliance_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceClassSubgroupUpdateCompliance_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeviceClassSubgroupUpdateComplianceAsync("<groupId>", "<deviceClassId>");
 
@@ -1372,9 +1352,9 @@ public async Task Example_GetDeviceClassSubgroupUpdateCompliance_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceClassSubgroupUpdateCompliance_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeviceClassSubgroupUpdateComplianceAsync("<groupId>", "<deviceClassId>");
 
@@ -1389,9 +1369,9 @@ public async Task Example_GetDeviceClassSubgroupUpdateCompliance_AllParameters_A
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBestUpdatesForDeviceClassSubgroup()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetBestUpdatesForDeviceClassSubgroup("<groupId>", "<deviceClassId>");
 
@@ -1408,9 +1388,9 @@ public void Example_GetBestUpdatesForDeviceClassSubgroup()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBestUpdatesForDeviceClassSubgroup_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetBestUpdatesForDeviceClassSubgroup("<groupId>", "<deviceClassId>");
 
@@ -1429,9 +1409,9 @@ public void Example_GetBestUpdatesForDeviceClassSubgroup_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBestUpdatesForDeviceClassSubgroup_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetBestUpdatesForDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>");
 
@@ -1448,9 +1428,9 @@ public async Task Example_GetBestUpdatesForDeviceClassSubgroup_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBestUpdatesForDeviceClassSubgroup_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetBestUpdatesForDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>");
 
@@ -1469,9 +1449,9 @@ public async Task Example_GetBestUpdatesForDeviceClassSubgroup_AllParameters_Asy
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeploymentForDeviceClassSubgroup()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeploymentForDeviceClassSubgroup("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1488,9 +1468,9 @@ public void Example_GetDeploymentForDeviceClassSubgroup()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeploymentForDeviceClassSubgroup_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeploymentForDeviceClassSubgroup("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1520,9 +1500,9 @@ public void Example_GetDeploymentForDeviceClassSubgroup_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeploymentForDeviceClassSubgroup_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeploymentForDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1539,9 +1519,9 @@ public async Task Example_GetDeploymentForDeviceClassSubgroup_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeploymentForDeviceClassSubgroup_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeploymentForDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1571,9 +1551,9 @@ public async Task Example_GetDeploymentForDeviceClassSubgroup_AllParameters_Asyn
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteDeploymentForDeviceClassSubgroup()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.DeleteDeploymentForDeviceClassSubgroup("<groupId>", "<deviceClassId>", "<deploymentId>");
             Console.WriteLine(response.Status);
@@ -1583,9 +1563,9 @@ public void Example_DeleteDeploymentForDeviceClassSubgroup()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteDeploymentForDeviceClassSubgroup_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.DeleteDeploymentForDeviceClassSubgroup("<groupId>", "<deviceClassId>", "<deploymentId>");
             Console.WriteLine(response.Status);
@@ -1595,9 +1575,9 @@ public void Example_DeleteDeploymentForDeviceClassSubgroup_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteDeploymentForDeviceClassSubgroup_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.DeleteDeploymentForDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
             Console.WriteLine(response.Status);
@@ -1607,9 +1587,9 @@ public async Task Example_DeleteDeploymentForDeviceClassSubgroup_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteDeploymentForDeviceClassSubgroup_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.DeleteDeploymentForDeviceClassSubgroupAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
             Console.WriteLine(response.Status);
@@ -1619,9 +1599,9 @@ public async Task Example_DeleteDeploymentForDeviceClassSubgroup_AllParameters_A
         [Ignore("Only validating compilation of examples")]
         public void Example_StopDeployment()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.StopDeployment("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1638,9 +1618,9 @@ public void Example_StopDeployment()
         [Ignore("Only validating compilation of examples")]
         public void Example_StopDeployment_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.StopDeployment("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1670,9 +1650,9 @@ public void Example_StopDeployment_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_StopDeployment_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.StopDeploymentAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1689,9 +1669,9 @@ public async Task Example_StopDeployment_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_StopDeployment_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.StopDeploymentAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1721,9 +1701,9 @@ public async Task Example_StopDeployment_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_RetryDeployment()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.RetryDeployment("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1740,9 +1720,9 @@ public void Example_RetryDeployment()
         [Ignore("Only validating compilation of examples")]
         public void Example_RetryDeployment_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.RetryDeployment("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1772,9 +1752,9 @@ public void Example_RetryDeployment_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RetryDeployment_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.RetryDeploymentAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1791,9 +1771,9 @@ public async Task Example_RetryDeployment_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RetryDeployment_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.RetryDeploymentAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1823,9 +1803,9 @@ public async Task Example_RetryDeployment_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceClassSubgroupDeploymentStatus()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeviceClassSubgroupDeploymentStatus("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1839,9 +1819,9 @@ public void Example_GetDeviceClassSubgroupDeploymentStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceClassSubgroupDeploymentStatus_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetDeviceClassSubgroupDeploymentStatus("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1867,9 +1847,9 @@ public void Example_GetDeviceClassSubgroupDeploymentStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceClassSubgroupDeploymentStatus_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeviceClassSubgroupDeploymentStatusAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1883,9 +1863,9 @@ public async Task Example_GetDeviceClassSubgroupDeploymentStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceClassSubgroupDeploymentStatus_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetDeviceClassSubgroupDeploymentStatusAsync("<groupId>", "<deviceClassId>", "<deploymentId>");
 
@@ -1911,9 +1891,9 @@ public async Task Example_GetDeviceClassSubgroupDeploymentStatus_AllParameters_A
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOperationStatus()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetOperationStatus("<operationId>");
 
@@ -1928,11 +1908,11 @@ public void Example_GetOperationStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOperationStatus_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            Response response = client.GetOperationStatus("<operationId>", null);
+            Response response = client.GetOperationStatus("<operationId>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("operationId").ToString());
@@ -1954,9 +1934,9 @@ public void Example_GetOperationStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOperationStatus_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetOperationStatusAsync("<operationId>");
 
@@ -1971,11 +1951,11 @@ public async Task Example_GetOperationStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOperationStatus_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            Response response = await client.GetOperationStatusAsync("<operationId>", null);
+            Response response = await client.GetOperationStatusAsync("<operationId>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("operationId").ToString());
@@ -1997,20 +1977,21 @@ public async Task Example_GetOperationStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_StartLogCollection()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                deviceList = new[] {
-        new {
-            deviceId = "<deviceId>",
-        }
-    },
-            };
-
-            Response response = client.StartLogCollection("<logCollectionId>", RequestContent.Create(data));
+                ["deviceList"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["deviceId"] = "<deviceId>",
+}
+},
+            });
+            Response response = client.StartLogCollection("<logCollectionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
@@ -2020,23 +2001,24 @@ public void Example_StartLogCollection()
         [Ignore("Only validating compilation of examples")]
         public void Example_StartLogCollection_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                operationId = "<operationId>",
-                deviceList = new[] {
-        new {
-            deviceId = "<deviceId>",
-            moduleId = "<moduleId>",
-        }
-    },
-                description = "<description>",
-            };
-
-            Response response = client.StartLogCollection("<logCollectionId>", RequestContent.Create(data));
+                ["operationId"] = "<operationId>",
+                ["deviceList"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["deviceId"] = "<deviceId>",
+["moduleId"] = "<moduleId>",
+}
+},
+                ["description"] = "<description>",
+            });
+            Response response = client.StartLogCollection("<logCollectionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("operationId").ToString());
@@ -2052,20 +2034,21 @@ public void Example_StartLogCollection_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_StartLogCollection_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                deviceList = new[] {
-        new {
-            deviceId = "<deviceId>",
-        }
-    },
-            };
-
-            Response response = await client.StartLogCollectionAsync("<logCollectionId>", RequestContent.Create(data));
+                ["deviceList"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["deviceId"] = "<deviceId>",
+}
+},
+            });
+            Response response = await client.StartLogCollectionAsync("<logCollectionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
@@ -2075,23 +2058,24 @@ public async Task Example_StartLogCollection_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_StartLogCollection_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                operationId = "<operationId>",
-                deviceList = new[] {
-        new {
-            deviceId = "<deviceId>",
-            moduleId = "<moduleId>",
-        }
-    },
-                description = "<description>",
-            };
-
-            Response response = await client.StartLogCollectionAsync("<logCollectionId>", RequestContent.Create(data));
+                ["operationId"] = "<operationId>",
+                ["deviceList"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["deviceId"] = "<deviceId>",
+["moduleId"] = "<moduleId>",
+}
+},
+                ["description"] = "<description>",
+            });
+            Response response = await client.StartLogCollectionAsync("<logCollectionId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("operationId").ToString());
@@ -2107,9 +2091,9 @@ public async Task Example_StartLogCollection_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLogCollection()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetLogCollection("<logCollectionId>");
 
@@ -2121,9 +2105,9 @@ public void Example_GetLogCollection()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLogCollection_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetLogCollection("<logCollectionId>");
 
@@ -2141,9 +2125,9 @@ public void Example_GetLogCollection_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLogCollection_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetLogCollectionAsync("<logCollectionId>");
 
@@ -2155,9 +2139,9 @@ public async Task Example_GetLogCollection_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLogCollection_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetLogCollectionAsync("<logCollectionId>");
 
@@ -2175,9 +2159,9 @@ public async Task Example_GetLogCollection_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLogCollectionDetailedStatus()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetLogCollectionDetailedStatus("<logCollectionId>");
 
@@ -2189,9 +2173,9 @@ public void Example_GetLogCollectionDetailedStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLogCollectionDetailedStatus_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetLogCollectionDetailedStatus("<logCollectionId>");
 
@@ -2213,9 +2197,9 @@ public void Example_GetLogCollectionDetailedStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLogCollectionDetailedStatus_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetLogCollectionDetailedStatusAsync("<logCollectionId>");
 
@@ -2227,9 +2211,9 @@ public async Task Example_GetLogCollectionDetailedStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLogCollectionDetailedStatus_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetLogCollectionDetailedStatusAsync("<logCollectionId>");
 
@@ -2251,15 +2235,15 @@ public async Task Example_GetLogCollectionDetailedStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceClasses()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetDeviceClasses())
+            foreach (BinaryData item in client.GetDeviceClasses())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
             }
         }
 
@@ -2267,23 +2251,23 @@ public void Example_GetDeviceClasses()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceClasses_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetDeviceClasses("<filter>"))
+            foreach (BinaryData item in client.GetDeviceClasses(filter: "<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("friendlyName").ToString());
             }
         }
 
@@ -2291,15 +2275,15 @@ public void Example_GetDeviceClasses_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceClasses_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetDeviceClassesAsync())
+            await foreach (BinaryData item in client.GetDeviceClassesAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
             }
         }
 
@@ -2307,23 +2291,23 @@ public async Task Example_GetDeviceClasses_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceClasses_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetDeviceClassesAsync("<filter>"))
+            await foreach (BinaryData item in client.GetDeviceClassesAsync(filter: "<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("bestCompatibleUpdate").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("contractModel").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassProperties").GetProperty("compatProperties").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("bestCompatibleUpdate").GetProperty("friendlyName").ToString());
             }
         }
 
@@ -2331,16 +2315,16 @@ public async Task Example_GetDeviceClasses_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetInstallableUpdatesForDeviceClasses()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetInstallableUpdatesForDeviceClasses("<deviceClassId>"))
+            foreach (BinaryData item in client.GetInstallableUpdatesForDeviceClasses("<deviceClassId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
             }
         }
 
@@ -2348,18 +2332,18 @@ public void Example_GetInstallableUpdatesForDeviceClasses()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetInstallableUpdatesForDeviceClasses_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetInstallableUpdatesForDeviceClasses("<deviceClassId>"))
+            foreach (BinaryData item in client.GetInstallableUpdatesForDeviceClasses("<deviceClassId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
             }
         }
 
@@ -2367,16 +2351,16 @@ public void Example_GetInstallableUpdatesForDeviceClasses_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetInstallableUpdatesForDeviceClasses_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetInstallableUpdatesForDeviceClassesAsync("<deviceClassId>"))
+            await foreach (BinaryData item in client.GetInstallableUpdatesForDeviceClassesAsync("<deviceClassId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
             }
         }
 
@@ -2384,18 +2368,18 @@ public async Task Example_GetInstallableUpdatesForDeviceClasses_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetInstallableUpdatesForDeviceClasses_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetInstallableUpdatesForDeviceClassesAsync("<deviceClassId>"))
+            await foreach (BinaryData item in client.GetInstallableUpdatesForDeviceClassesAsync("<deviceClassId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
             }
         }
 
@@ -2403,16 +2387,16 @@ public async Task Example_GetInstallableUpdatesForDeviceClasses_AllParameters_As
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDevices()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetDevices())
+            foreach (BinaryData item in client.GetDevices())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("onLatestUpdate").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("onLatestUpdate").ToString());
             }
         }
 
@@ -2420,42 +2404,42 @@ public void Example_GetDevices()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDevices_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetDevices("<filter>"))
+            foreach (BinaryData item in client.GetDevices(filter: "<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("moduleId").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("deploymentStatus").ToString());
-                Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("onLatestUpdate").ToString());
-                Console.WriteLine(result.GetProperty("lastDeploymentId").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("resultCode").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("extendedResultCode").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("resultDetails").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultCode").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("extendedResultCode").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultDetails").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("moduleId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentStatus").ToString());
+                Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("onLatestUpdate").ToString());
+                Console.WriteLine(result[0].GetProperty("lastDeploymentId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("resultCode").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("extendedResultCode").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("resultDetails").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultCode").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("extendedResultCode").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultDetails").ToString());
             }
         }
 
@@ -2463,16 +2447,16 @@ public void Example_GetDevices_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDevices_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetDevicesAsync())
+            await foreach (BinaryData item in client.GetDevicesAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("onLatestUpdate").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("onLatestUpdate").ToString());
             }
         }
 
@@ -2480,42 +2464,42 @@ public async Task Example_GetDevices_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDevices_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetDevicesAsync("<filter>"))
+            await foreach (BinaryData item in client.GetDevicesAsync(filter: "<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("moduleId").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("lastAttemptedUpdate").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("deploymentStatus").ToString());
-                Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("installedUpdate").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("onLatestUpdate").ToString());
-                Console.WriteLine(result.GetProperty("lastDeploymentId").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("resultCode").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("extendedResultCode").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("resultDetails").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultCode").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("extendedResultCode").ToString());
-                Console.WriteLine(result.GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultDetails").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("moduleId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("lastAttemptedUpdate").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentStatus").ToString());
+                Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("installedUpdate").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("onLatestUpdate").ToString());
+                Console.WriteLine(result[0].GetProperty("lastDeploymentId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("resultCode").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("extendedResultCode").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("resultDetails").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("update").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultCode").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("extendedResultCode").ToString());
+                Console.WriteLine(result[0].GetProperty("lastInstallResult").GetProperty("stepResults")[0].GetProperty("resultDetails").ToString());
             }
         }
 
@@ -2523,16 +2507,16 @@ public async Task Example_GetDevices_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGroups()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetGroups())
+            foreach (BinaryData item in client.GetGroups())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("groupType").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("groupType").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
             }
         }
 
@@ -2540,21 +2524,21 @@ public void Example_GetGroups()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGroups_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetGroups("<orderBy>"))
+            foreach (BinaryData item in client.GetGroups(orderBy: "<orderBy>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("groupType").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("deviceCount").ToString());
-                Console.WriteLine(result.GetProperty("subgroupsWithNewUpdatesAvailableCount").ToString());
-                Console.WriteLine(result.GetProperty("subgroupsWithUpdatesInProgressCount").ToString());
-                Console.WriteLine(result.GetProperty("subgroupsWithOnLatestUpdateCount").ToString());
-                Console.WriteLine(result.GetProperty("deployments")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("groupType").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
+                Console.WriteLine(result[0].GetProperty("subgroupsWithNewUpdatesAvailableCount").ToString());
+                Console.WriteLine(result[0].GetProperty("subgroupsWithUpdatesInProgressCount").ToString());
+                Console.WriteLine(result[0].GetProperty("subgroupsWithOnLatestUpdateCount").ToString());
+                Console.WriteLine(result[0].GetProperty("deployments")[0].ToString());
             }
         }
 
@@ -2562,16 +2546,16 @@ public void Example_GetGroups_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGroups_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetGroupsAsync())
+            await foreach (BinaryData item in client.GetGroupsAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("groupType").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("groupType").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
             }
         }
 
@@ -2579,21 +2563,21 @@ public async Task Example_GetGroups_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGroups_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetGroupsAsync("<orderBy>"))
+            await foreach (BinaryData item in client.GetGroupsAsync(orderBy: "<orderBy>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("groupType").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("deviceCount").ToString());
-                Console.WriteLine(result.GetProperty("subgroupsWithNewUpdatesAvailableCount").ToString());
-                Console.WriteLine(result.GetProperty("subgroupsWithUpdatesInProgressCount").ToString());
-                Console.WriteLine(result.GetProperty("subgroupsWithOnLatestUpdateCount").ToString());
-                Console.WriteLine(result.GetProperty("deployments")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("groupType").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
+                Console.WriteLine(result[0].GetProperty("subgroupsWithNewUpdatesAvailableCount").ToString());
+                Console.WriteLine(result[0].GetProperty("subgroupsWithUpdatesInProgressCount").ToString());
+                Console.WriteLine(result[0].GetProperty("subgroupsWithOnLatestUpdateCount").ToString());
+                Console.WriteLine(result[0].GetProperty("deployments")[0].ToString());
             }
         }
 
@@ -2601,19 +2585,19 @@ public async Task Example_GetGroups_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBestUpdatesForGroups()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetBestUpdatesForGroups("<groupId>"))
+            foreach (BinaryData item in client.GetBestUpdatesForGroups("<groupId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("deviceCount").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
             }
         }
 
@@ -2621,21 +2605,21 @@ public void Example_GetBestUpdatesForGroups()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBestUpdatesForGroups_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetBestUpdatesForGroups("<groupId>"))
+            foreach (BinaryData item in client.GetBestUpdatesForGroups("<groupId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("deviceCount").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
             }
         }
 
@@ -2643,19 +2627,19 @@ public void Example_GetBestUpdatesForGroups_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBestUpdatesForGroups_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetBestUpdatesForGroupsAsync("<groupId>"))
+            await foreach (BinaryData item in client.GetBestUpdatesForGroupsAsync("<groupId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("deviceCount").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
             }
         }
 
@@ -2663,21 +2647,21 @@ public async Task Example_GetBestUpdatesForGroups_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBestUpdatesForGroups_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetBestUpdatesForGroupsAsync("<groupId>"))
+            await foreach (BinaryData item in client.GetBestUpdatesForGroupsAsync("<groupId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("deviceCount").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
             }
         }
 
@@ -2685,19 +2669,19 @@ public async Task Example_GetBestUpdatesForGroups_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeploymentsForGroups()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetDeploymentsForGroups("<groupId>"))
+            foreach (BinaryData item in client.GetDeploymentsForGroups("<groupId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deploymentId").ToString());
-                Console.WriteLine(result.GetProperty("startDateTime").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+                Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
             }
         }
 
@@ -2705,32 +2689,32 @@ public void Example_GetDeploymentsForGroups()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeploymentsForGroups_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetDeploymentsForGroups("<groupId>", "<orderBy>"))
+            foreach (BinaryData item in client.GetDeploymentsForGroups("<groupId>", orderBy: "<orderBy>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deploymentId").ToString());
-                Console.WriteLine(result.GetProperty("startDateTime").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassSubgroups")[0].ToString());
-                Console.WriteLine(result.GetProperty("isCanceled").ToString());
-                Console.WriteLine(result.GetProperty("isRetried").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
-                Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+                Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassSubgroups")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("isCanceled").ToString());
+                Console.WriteLine(result[0].GetProperty("isRetried").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("isCloudInitiatedRollback").ToString());
             }
         }
 
@@ -2738,19 +2722,19 @@ public void Example_GetDeploymentsForGroups_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeploymentsForGroups_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetDeploymentsForGroupsAsync("<groupId>"))
+            await foreach (BinaryData item in client.GetDeploymentsForGroupsAsync("<groupId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deploymentId").ToString());
-                Console.WriteLine(result.GetProperty("startDateTime").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+                Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
             }
         }
 
@@ -2758,32 +2742,32 @@ public async Task Example_GetDeploymentsForGroups_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeploymentsForGroups_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetDeploymentsForGroupsAsync("<groupId>", "<orderBy>"))
+            await foreach (BinaryData item in client.GetDeploymentsForGroupsAsync("<groupId>", orderBy: "<orderBy>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deploymentId").ToString());
-                Console.WriteLine(result.GetProperty("startDateTime").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassSubgroups")[0].ToString());
-                Console.WriteLine(result.GetProperty("isCanceled").ToString());
-                Console.WriteLine(result.GetProperty("isRetried").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
-                Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+                Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassSubgroups")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("isCanceled").ToString());
+                Console.WriteLine(result[0].GetProperty("isRetried").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("isCloudInitiatedRollback").ToString());
             }
         }
 
@@ -2791,16 +2775,16 @@ public async Task Example_GetDeploymentsForGroups_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceClassSubgroupsForGroups()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetDeviceClassSubgroupsForGroups("<groupId>"))
+            foreach (BinaryData item in client.GetDeviceClassSubgroupsForGroups("<groupId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
             }
         }
 
@@ -2808,18 +2792,18 @@ public void Example_GetDeviceClassSubgroupsForGroups()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceClassSubgroupsForGroups_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetDeviceClassSubgroupsForGroups("<groupId>", "<filter>"))
+            foreach (BinaryData item in client.GetDeviceClassSubgroupsForGroups("<groupId>", filter: "<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("deviceCount").ToString());
-                Console.WriteLine(result.GetProperty("deploymentId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
             }
         }
 
@@ -2827,16 +2811,16 @@ public void Example_GetDeviceClassSubgroupsForGroups_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceClassSubgroupsForGroups_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetDeviceClassSubgroupsForGroupsAsync("<groupId>"))
+            await foreach (BinaryData item in client.GetDeviceClassSubgroupsForGroupsAsync("<groupId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
             }
         }
 
@@ -2844,18 +2828,18 @@ public async Task Example_GetDeviceClassSubgroupsForGroups_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceClassSubgroupsForGroups_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetDeviceClassSubgroupsForGroupsAsync("<groupId>", "<filter>"))
+            await foreach (BinaryData item in client.GetDeviceClassSubgroupsForGroupsAsync("<groupId>", filter: "<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceClassId").ToString());
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("deviceCount").ToString());
-                Console.WriteLine(result.GetProperty("deploymentId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassId").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceCount").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
             }
         }
 
@@ -2863,19 +2847,19 @@ public async Task Example_GetDeviceClassSubgroupsForGroups_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeploymentsForDeviceClassSubgroups()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetDeploymentsForDeviceClassSubgroups("<groupId>", "<deviceClassId>"))
+            foreach (BinaryData item in client.GetDeploymentsForDeviceClassSubgroups("<groupId>", "<deviceClassId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deploymentId").ToString());
-                Console.WriteLine(result.GetProperty("startDateTime").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+                Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
             }
         }
 
@@ -2883,32 +2867,32 @@ public void Example_GetDeploymentsForDeviceClassSubgroups()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeploymentsForDeviceClassSubgroups_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetDeploymentsForDeviceClassSubgroups("<groupId>", "<deviceClassId>", "<orderBy>"))
+            foreach (BinaryData item in client.GetDeploymentsForDeviceClassSubgroups("<groupId>", "<deviceClassId>", orderBy: "<orderBy>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deploymentId").ToString());
-                Console.WriteLine(result.GetProperty("startDateTime").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassSubgroups")[0].ToString());
-                Console.WriteLine(result.GetProperty("isCanceled").ToString());
-                Console.WriteLine(result.GetProperty("isRetried").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
-                Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+                Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassSubgroups")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("isCanceled").ToString());
+                Console.WriteLine(result[0].GetProperty("isRetried").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("isCloudInitiatedRollback").ToString());
             }
         }
 
@@ -2916,19 +2900,19 @@ public void Example_GetDeploymentsForDeviceClassSubgroups_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeploymentsForDeviceClassSubgroups_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetDeploymentsForDeviceClassSubgroupsAsync("<groupId>", "<deviceClassId>"))
+            await foreach (BinaryData item in client.GetDeploymentsForDeviceClassSubgroupsAsync("<groupId>", "<deviceClassId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deploymentId").ToString());
-                Console.WriteLine(result.GetProperty("startDateTime").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+                Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
             }
         }
 
@@ -2936,32 +2920,32 @@ public async Task Example_GetDeploymentsForDeviceClassSubgroups_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeploymentsForDeviceClassSubgroups_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetDeploymentsForDeviceClassSubgroupsAsync("<groupId>", "<deviceClassId>", "<orderBy>"))
+            await foreach (BinaryData item in client.GetDeploymentsForDeviceClassSubgroupsAsync("<groupId>", "<deviceClassId>", orderBy: "<orderBy>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deploymentId").ToString());
-                Console.WriteLine(result.GetProperty("startDateTime").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("groupId").ToString());
-                Console.WriteLine(result.GetProperty("deviceClassSubgroups")[0].ToString());
-                Console.WriteLine(result.GetProperty("isCanceled").ToString());
-                Console.WriteLine(result.GetProperty("isRetried").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
-                Console.WriteLine(result.GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
-                Console.WriteLine(result.GetProperty("isCloudInitiatedRollback").ToString());
+                Console.WriteLine(result[0].GetProperty("deploymentId").ToString());
+                Console.WriteLine(result[0].GetProperty("startDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("groupId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceClassSubgroups")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("isCanceled").ToString());
+                Console.WriteLine(result[0].GetProperty("isRetried").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("update").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedPercentage").ToString());
+                Console.WriteLine(result[0].GetProperty("rollbackPolicy").GetProperty("failure").GetProperty("devicesFailedCount").ToString());
+                Console.WriteLine(result[0].GetProperty("isCloudInitiatedRollback").ToString());
             }
         }
 
@@ -2969,17 +2953,17 @@ public async Task Example_GetDeploymentsForDeviceClassSubgroups_AllParameters_As
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceStatesForDeviceClassSubgroupDeployments()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetDeviceStatesForDeviceClassSubgroupDeployments("<groupId>", "<deviceClassId>", "<deploymentId>"))
+            foreach (BinaryData item in client.GetDeviceStatesForDeviceClassSubgroupDeployments("<groupId>", "<deviceClassId>", "<deploymentId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("retryCount").ToString());
-                Console.WriteLine(result.GetProperty("movedOnToNewDeployment").ToString());
-                Console.WriteLine(result.GetProperty("deviceState").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("retryCount").ToString());
+                Console.WriteLine(result[0].GetProperty("movedOnToNewDeployment").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceState").ToString());
             }
         }
 
@@ -2987,18 +2971,18 @@ public void Example_GetDeviceStatesForDeviceClassSubgroupDeployments()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDeviceStatesForDeviceClassSubgroupDeployments_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetDeviceStatesForDeviceClassSubgroupDeployments("<groupId>", "<deviceClassId>", "<deploymentId>", "<filter>"))
+            foreach (BinaryData item in client.GetDeviceStatesForDeviceClassSubgroupDeployments("<groupId>", "<deviceClassId>", "<deploymentId>", filter: "<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("moduleId").ToString());
-                Console.WriteLine(result.GetProperty("retryCount").ToString());
-                Console.WriteLine(result.GetProperty("movedOnToNewDeployment").ToString());
-                Console.WriteLine(result.GetProperty("deviceState").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("moduleId").ToString());
+                Console.WriteLine(result[0].GetProperty("retryCount").ToString());
+                Console.WriteLine(result[0].GetProperty("movedOnToNewDeployment").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceState").ToString());
             }
         }
 
@@ -3006,17 +2990,17 @@ public void Example_GetDeviceStatesForDeviceClassSubgroupDeployments_AllParamete
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceStatesForDeviceClassSubgroupDeployments_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetDeviceStatesForDeviceClassSubgroupDeploymentsAsync("<groupId>", "<deviceClassId>", "<deploymentId>"))
+            await foreach (BinaryData item in client.GetDeviceStatesForDeviceClassSubgroupDeploymentsAsync("<groupId>", "<deviceClassId>", "<deploymentId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("retryCount").ToString());
-                Console.WriteLine(result.GetProperty("movedOnToNewDeployment").ToString());
-                Console.WriteLine(result.GetProperty("deviceState").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("retryCount").ToString());
+                Console.WriteLine(result[0].GetProperty("movedOnToNewDeployment").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceState").ToString());
             }
         }
 
@@ -3024,18 +3008,18 @@ public async Task Example_GetDeviceStatesForDeviceClassSubgroupDeployments_Async
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDeviceStatesForDeviceClassSubgroupDeployments_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetDeviceStatesForDeviceClassSubgroupDeploymentsAsync("<groupId>", "<deviceClassId>", "<deploymentId>", "<filter>"))
+            await foreach (BinaryData item in client.GetDeviceStatesForDeviceClassSubgroupDeploymentsAsync("<groupId>", "<deviceClassId>", "<deploymentId>", filter: "<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("moduleId").ToString());
-                Console.WriteLine(result.GetProperty("retryCount").ToString());
-                Console.WriteLine(result.GetProperty("movedOnToNewDeployment").ToString());
-                Console.WriteLine(result.GetProperty("deviceState").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("moduleId").ToString());
+                Console.WriteLine(result[0].GetProperty("retryCount").ToString());
+                Console.WriteLine(result[0].GetProperty("movedOnToNewDeployment").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceState").ToString());
             }
         }
 
@@ -3043,17 +3027,17 @@ public async Task Example_GetDeviceStatesForDeviceClassSubgroupDeployments_AllPa
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOperationStatuses()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetOperationStatuses())
+            foreach (BinaryData item in client.GetOperationStatuses())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("operationId").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationId").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
             }
         }
 
@@ -3061,26 +3045,26 @@ public void Example_GetOperationStatuses()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOperationStatuses_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetOperationStatuses("<filter>", 1234))
+            foreach (BinaryData item in client.GetOperationStatuses(filter: "<filter>", top: 1234))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("operationId").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("occurredDateTime").ToString());
-                Console.WriteLine(result.GetProperty("traceId").ToString());
-                Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("etag").ToString());
+                Console.WriteLine(result[0].GetProperty("operationId").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("occurredDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("traceId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("etag").ToString());
             }
         }
 
@@ -3088,17 +3072,17 @@ public void Example_GetOperationStatuses_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOperationStatuses_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetOperationStatusesAsync())
+            await foreach (BinaryData item in client.GetOperationStatusesAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("operationId").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationId").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
             }
         }
 
@@ -3106,26 +3090,26 @@ public async Task Example_GetOperationStatuses_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOperationStatuses_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetOperationStatusesAsync("<filter>", 1234))
+            await foreach (BinaryData item in client.GetOperationStatusesAsync(filter: "<filter>", top: 1234))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("operationId").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("occurredDateTime").ToString());
-                Console.WriteLine(result.GetProperty("traceId").ToString());
-                Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("etag").ToString());
+                Console.WriteLine(result[0].GetProperty("operationId").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("occurredDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("traceId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("etag").ToString());
             }
         }
 
@@ -3133,14 +3117,14 @@ public async Task Example_GetOperationStatuses_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLogCollections()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetLogCollections())
+            foreach (BinaryData item in client.GetLogCollections())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
             }
         }
 
@@ -3148,20 +3132,20 @@ public void Example_GetLogCollections()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLogCollections_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetLogCollections())
+            foreach (BinaryData item in client.GetLogCollections())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("operationId").ToString());
-                Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("moduleId").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("operationId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceList")[0].GetProperty("moduleId").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
             }
         }
 
@@ -3169,14 +3153,14 @@ public void Example_GetLogCollections_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLogCollections_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetLogCollectionsAsync())
+            await foreach (BinaryData item in client.GetLogCollectionsAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
             }
         }
 
@@ -3184,20 +3168,20 @@ public async Task Example_GetLogCollections_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLogCollections_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetLogCollectionsAsync())
+            await foreach (BinaryData item in client.GetLogCollectionsAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("operationId").ToString());
-                Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("deviceList")[0].GetProperty("moduleId").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("operationId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceList")[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceList")[0].GetProperty("moduleId").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
             }
         }
 
@@ -3205,16 +3189,16 @@ public async Task Example_GetLogCollections_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetHealthOfDevices()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetHealthOfDevices("<filter>"))
+            foreach (BinaryData item in client.GetHealthOfDevices("<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("state").ToString());
-                Console.WriteLine(result.GetProperty("healthChecks")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("state").ToString());
+                Console.WriteLine(result[0].GetProperty("healthChecks")[0].ToString());
             }
         }
 
@@ -3222,19 +3206,19 @@ public void Example_GetHealthOfDevices()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetHealthOfDevices_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetHealthOfDevices("<filter>"))
+            foreach (BinaryData item in client.GetHealthOfDevices("<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("moduleId").ToString());
-                Console.WriteLine(result.GetProperty("state").ToString());
-                Console.WriteLine(result.GetProperty("digitalTwinModelId").ToString());
-                Console.WriteLine(result.GetProperty("healthChecks")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("healthChecks")[0].GetProperty("result").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("moduleId").ToString());
+                Console.WriteLine(result[0].GetProperty("state").ToString());
+                Console.WriteLine(result[0].GetProperty("digitalTwinModelId").ToString());
+                Console.WriteLine(result[0].GetProperty("healthChecks")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("healthChecks")[0].GetProperty("result").ToString());
             }
         }
 
@@ -3242,16 +3226,16 @@ public void Example_GetHealthOfDevices_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetHealthOfDevices_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetHealthOfDevicesAsync("<filter>"))
+            await foreach (BinaryData item in client.GetHealthOfDevicesAsync("<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("state").ToString());
-                Console.WriteLine(result.GetProperty("healthChecks")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("state").ToString());
+                Console.WriteLine(result[0].GetProperty("healthChecks")[0].ToString());
             }
         }
 
@@ -3259,19 +3243,19 @@ public async Task Example_GetHealthOfDevices_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetHealthOfDevices_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetHealthOfDevicesAsync("<filter>"))
+            await foreach (BinaryData item in client.GetHealthOfDevicesAsync("<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("deviceId").ToString());
-                Console.WriteLine(result.GetProperty("moduleId").ToString());
-                Console.WriteLine(result.GetProperty("state").ToString());
-                Console.WriteLine(result.GetProperty("digitalTwinModelId").ToString());
-                Console.WriteLine(result.GetProperty("healthChecks")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("healthChecks")[0].GetProperty("result").ToString());
+                Console.WriteLine(result[0].GetProperty("deviceId").ToString());
+                Console.WriteLine(result[0].GetProperty("moduleId").ToString());
+                Console.WriteLine(result[0].GetProperty("state").ToString());
+                Console.WriteLine(result[0].GetProperty("digitalTwinModelId").ToString());
+                Console.WriteLine(result[0].GetProperty("healthChecks")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("healthChecks")[0].GetProperty("result").ToString());
             }
         }
 
@@ -3279,60 +3263,48 @@ public async Task Example_GetHealthOfDevices_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_ImportDevices()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
-
-            var data = "Devices";
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            var operation = client.ImportDevices(WaitUntil.Completed, RequestContent.Create(data));
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            RequestContent content = RequestContent.Create("Devices");
+            Operation operation = client.ImportDevices(WaitUntil.Completed, content);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_ImportDevices_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
-
-            var data = "Devices";
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            var operation = client.ImportDevices(WaitUntil.Completed, RequestContent.Create(data));
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            RequestContent content = RequestContent.Create("Devices");
+            Operation operation = client.ImportDevices(WaitUntil.Completed, content);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ImportDevices_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
-
-            var data = "Devices";
-
-            var operation = await client.ImportDevicesAsync(WaitUntil.Completed, RequestContent.Create(data));
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            RequestContent content = RequestContent.Create("Devices");
+            Operation operation = await client.ImportDevicesAsync(WaitUntil.Completed, content);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ImportDevices_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceManagementClient(endpoint, "<instanceId>", credential);
-
-            var data = "Devices";
-
-            var operation = await client.ImportDevicesAsync(WaitUntil.Completed, RequestContent.Create(data));
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceManagementClient client = new DeviceManagementClient(endpoint, "<InstanceId>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            RequestContent content = RequestContent.Create("Devices");
+            Operation operation = await client.ImportDevicesAsync(WaitUntil.Completed, content);
         }
     }
 }
diff --git a/sdk/deviceupdate/Azure.IoT.DeviceUpdate/tests/Generated/Samples/Samples_DeviceUpdateClient.cs b/sdk/deviceupdate/Azure.IoT.DeviceUpdate/tests/Generated/Samples/Samples_DeviceUpdateClient.cs
index c82023008514..7e4bb682ed36 100644
--- a/sdk/deviceupdate/Azure.IoT.DeviceUpdate/tests/Generated/Samples/Samples_DeviceUpdateClient.cs
+++ b/sdk/deviceupdate/Azure.IoT.DeviceUpdate/tests/Generated/Samples/Samples_DeviceUpdateClient.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.IoT.DeviceUpdate;
 using NUnit.Framework;
 
 namespace Azure.IoT.DeviceUpdate.Samples
@@ -23,9 +23,9 @@ public class Samples_DeviceUpdateClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetUpdate("<provider>", "<name>", "<version>");
 
@@ -33,7 +33,7 @@ public void Example_GetUpdate()
             Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
             Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
             Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("manifestVersion").ToString());
             Console.WriteLine(result.GetProperty("importedDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -43,11 +43,11 @@ public void Example_GetUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            Response response = client.GetUpdate("<provider>", "<name>", "<version>", null);
+            Response response = client.GetUpdate("<provider>", "<name>", "<version>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
@@ -58,7 +58,7 @@ public void Example_GetUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("isDeployable").ToString());
             Console.WriteLine(result.GetProperty("updateType").ToString());
             Console.WriteLine(result.GetProperty("installedCriteria").ToString());
-            Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("handler").ToString());
@@ -81,9 +81,9 @@ public void Example_GetUpdate_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetUpdateAsync("<provider>", "<name>", "<version>");
 
@@ -91,7 +91,7 @@ public async Task Example_GetUpdate_Async()
             Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
             Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
             Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("manifestVersion").ToString());
             Console.WriteLine(result.GetProperty("importedDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -101,11 +101,11 @@ public async Task Example_GetUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            Response response = await client.GetUpdateAsync("<provider>", "<name>", "<version>", null);
+            Response response = await client.GetUpdateAsync("<provider>", "<name>", "<version>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
@@ -116,7 +116,7 @@ public async Task Example_GetUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("isDeployable").ToString());
             Console.WriteLine(result.GetProperty("updateType").ToString());
             Console.WriteLine(result.GetProperty("installedCriteria").ToString());
-            Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("handler").ToString());
@@ -139,9 +139,9 @@ public async Task Example_GetUpdate_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFile()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetFile("<provider>", "<name>", "<version>", "<fileId>");
 
@@ -149,46 +149,46 @@ public void Example_GetFile()
             Console.WriteLine(result.GetProperty("fileId").ToString());
             Console.WriteLine(result.GetProperty("fileName").ToString());
             Console.WriteLine(result.GetProperty("sizeInBytes").ToString());
-            Console.WriteLine(result.GetProperty("hashes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("hashes").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFile_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            Response response = client.GetFile("<provider>", "<name>", "<version>", "<fileId>", null);
+            Response response = client.GetFile("<provider>", "<name>", "<version>", "<fileId>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("fileId").ToString());
             Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("fileName").ToString());
             Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("sizeInBytes").ToString());
-            Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("hashes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("hashes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("mimeType").ToString());
             Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("scanResult").ToString());
             Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("scanDetails").ToString());
-            Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("properties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("downloadHandler").GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("etag").ToString());
             Console.WriteLine(result.GetProperty("fileName").ToString());
             Console.WriteLine(result.GetProperty("sizeInBytes").ToString());
-            Console.WriteLine(result.GetProperty("hashes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("hashes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("mimeType").ToString());
             Console.WriteLine(result.GetProperty("scanResult").ToString());
             Console.WriteLine(result.GetProperty("scanDetails").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFile_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetFileAsync("<provider>", "<name>", "<version>", "<fileId>");
 
@@ -196,46 +196,46 @@ public async Task Example_GetFile_Async()
             Console.WriteLine(result.GetProperty("fileId").ToString());
             Console.WriteLine(result.GetProperty("fileName").ToString());
             Console.WriteLine(result.GetProperty("sizeInBytes").ToString());
-            Console.WriteLine(result.GetProperty("hashes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("hashes").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFile_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            Response response = await client.GetFileAsync("<provider>", "<name>", "<version>", "<fileId>", null);
+            Response response = await client.GetFileAsync("<provider>", "<name>", "<version>", "<fileId>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("fileId").ToString());
             Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("fileName").ToString());
             Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("sizeInBytes").ToString());
-            Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("hashes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("hashes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("mimeType").ToString());
             Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("scanResult").ToString());
             Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("scanDetails").ToString());
-            Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relatedFiles")[0].GetProperty("properties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("downloadHandler").GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("etag").ToString());
             Console.WriteLine(result.GetProperty("fileName").ToString());
             Console.WriteLine(result.GetProperty("sizeInBytes").ToString());
-            Console.WriteLine(result.GetProperty("hashes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("hashes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("mimeType").ToString());
             Console.WriteLine(result.GetProperty("scanResult").ToString());
             Console.WriteLine(result.GetProperty("scanDetails").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOperationStatus()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
             Response response = client.GetOperationStatus("<operationId>");
 
@@ -250,11 +250,11 @@ public void Example_GetOperationStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOperationStatus_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            Response response = client.GetOperationStatus("<operationId>", null);
+            Response response = client.GetOperationStatus("<operationId>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("operationId").ToString());
@@ -282,9 +282,9 @@ public void Example_GetOperationStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOperationStatus_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
             Response response = await client.GetOperationStatusAsync("<operationId>");
 
@@ -299,11 +299,11 @@ public async Task Example_GetOperationStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOperationStatus_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            Response response = await client.GetOperationStatusAsync("<operationId>", null);
+            Response response = await client.GetOperationStatusAsync("<operationId>", ifNoneMatch: new ETag("<ifNoneMatch>"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("operationId").ToString());
@@ -331,20 +331,20 @@ public async Task Example_GetOperationStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpdates()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetUpdates())
+            foreach (BinaryData item in client.GetUpdates())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("manifestVersion").ToString());
-                Console.WriteLine(result.GetProperty("importedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("compatibility")[0].GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("manifestVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("importedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
             }
         }
 
@@ -352,38 +352,38 @@ public void Example_GetUpdates()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetUpdates_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetUpdates("<search>", "<filter>"))
+            foreach (BinaryData item in client.GetUpdates(search: "<search>", filter: "<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("isDeployable").ToString());
-                Console.WriteLine(result.GetProperty("updateType").ToString());
-                Console.WriteLine(result.GetProperty("installedCriteria").ToString());
-                Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("handler").ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("handlerProperties").ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("files")[0].ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("referencedBy")[0].GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("referencedBy")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("referencedBy")[0].GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("scanResult").ToString());
-                Console.WriteLine(result.GetProperty("manifestVersion").ToString());
-                Console.WriteLine(result.GetProperty("importedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("etag").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("isDeployable").ToString());
+                Console.WriteLine(result[0].GetProperty("updateType").ToString());
+                Console.WriteLine(result[0].GetProperty("installedCriteria").ToString());
+                Console.WriteLine(result[0].GetProperty("compatibility")[0].GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("handler").ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("handlerProperties").ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("files")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("referencedBy")[0].GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("referencedBy")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("referencedBy")[0].GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResult").ToString());
+                Console.WriteLine(result[0].GetProperty("manifestVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("importedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("etag").ToString());
             }
         }
 
@@ -391,20 +391,20 @@ public void Example_GetUpdates_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpdates_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetUpdatesAsync())
+            await foreach (BinaryData item in client.GetUpdatesAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("manifestVersion").ToString());
-                Console.WriteLine(result.GetProperty("importedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("compatibility")[0].GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("manifestVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("importedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
             }
         }
 
@@ -412,38 +412,38 @@ public async Task Example_GetUpdates_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetUpdates_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetUpdatesAsync("<search>", "<filter>"))
+            await foreach (BinaryData item in client.GetUpdatesAsync(search: "<search>", filter: "<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("isDeployable").ToString());
-                Console.WriteLine(result.GetProperty("updateType").ToString());
-                Console.WriteLine(result.GetProperty("installedCriteria").ToString());
-                Console.WriteLine(result.GetProperty("compatibility")[0].GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("handler").ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("handlerProperties").ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("files")[0].ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("referencedBy")[0].GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("referencedBy")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("referencedBy")[0].GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("scanResult").ToString());
-                Console.WriteLine(result.GetProperty("manifestVersion").ToString());
-                Console.WriteLine(result.GetProperty("importedDateTime").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("etag").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("isDeployable").ToString());
+                Console.WriteLine(result[0].GetProperty("updateType").ToString());
+                Console.WriteLine(result[0].GetProperty("installedCriteria").ToString());
+                Console.WriteLine(result[0].GetProperty("compatibility")[0].GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("handler").ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("handlerProperties").ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("files")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("instructions").GetProperty("steps")[0].GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("referencedBy")[0].GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("referencedBy")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("referencedBy")[0].GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResult").ToString());
+                Console.WriteLine(result[0].GetProperty("manifestVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("importedDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("etag").ToString());
             }
         }
 
@@ -451,14 +451,14 @@ public async Task Example_GetUpdates_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProviders()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetProviders())
+            foreach (BinaryData item in client.GetProviders())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -466,14 +466,14 @@ public void Example_GetProviders()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProviders_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetProviders())
+            foreach (BinaryData item in client.GetProviders())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -481,14 +481,14 @@ public void Example_GetProviders_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProviders_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetProvidersAsync())
+            await foreach (BinaryData item in client.GetProvidersAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -496,14 +496,14 @@ public async Task Example_GetProviders_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProviders_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetProvidersAsync())
+            await foreach (BinaryData item in client.GetProvidersAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -511,14 +511,14 @@ public async Task Example_GetProviders_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetNames()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetNames("<provider>"))
+            foreach (BinaryData item in client.GetNames("<provider>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -526,14 +526,14 @@ public void Example_GetNames()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetNames_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetNames("<provider>"))
+            foreach (BinaryData item in client.GetNames("<provider>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -541,14 +541,14 @@ public void Example_GetNames_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetNames_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetNamesAsync("<provider>"))
+            await foreach (BinaryData item in client.GetNamesAsync("<provider>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -556,14 +556,14 @@ public async Task Example_GetNames_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetNames_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetNamesAsync("<provider>"))
+            await foreach (BinaryData item in client.GetNamesAsync("<provider>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -571,14 +571,14 @@ public async Task Example_GetNames_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetVersions()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetVersions("<provider>", "<name>"))
+            foreach (BinaryData item in client.GetVersions("<provider>", "<name>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -586,14 +586,14 @@ public void Example_GetVersions()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetVersions_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetVersions("<provider>", "<name>", "<filter>"))
+            foreach (BinaryData item in client.GetVersions("<provider>", "<name>", filter: "<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -601,14 +601,14 @@ public void Example_GetVersions_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetVersions_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetVersionsAsync("<provider>", "<name>"))
+            await foreach (BinaryData item in client.GetVersionsAsync("<provider>", "<name>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -616,14 +616,14 @@ public async Task Example_GetVersions_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetVersions_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetVersionsAsync("<provider>", "<name>", "<filter>"))
+            await foreach (BinaryData item in client.GetVersionsAsync("<provider>", "<name>", filter: "<filter>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -631,14 +631,14 @@ public async Task Example_GetVersions_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFiles()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetFiles("<provider>", "<name>", "<version>"))
+            foreach (BinaryData item in client.GetFiles("<provider>", "<name>", "<version>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -646,14 +646,14 @@ public void Example_GetFiles()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFiles_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetFiles("<provider>", "<name>", "<version>"))
+            foreach (BinaryData item in client.GetFiles("<provider>", "<name>", "<version>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -661,14 +661,14 @@ public void Example_GetFiles_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFiles_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetFilesAsync("<provider>", "<name>", "<version>"))
+            await foreach (BinaryData item in client.GetFilesAsync("<provider>", "<name>", "<version>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -676,14 +676,14 @@ public async Task Example_GetFiles_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFiles_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetFilesAsync("<provider>", "<name>", "<version>"))
+            await foreach (BinaryData item in client.GetFilesAsync("<provider>", "<name>", "<version>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -691,17 +691,17 @@ public async Task Example_GetFiles_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOperationStatuses()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetOperationStatuses())
+            foreach (BinaryData item in client.GetOperationStatuses())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("operationId").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationId").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
             }
         }
 
@@ -709,32 +709,32 @@ public void Example_GetOperationStatuses()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetOperationStatuses_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            foreach (var item in client.GetOperationStatuses("<filter>", 1234))
+            foreach (BinaryData item in client.GetOperationStatuses(filter: "<filter>", top: 1234))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("operationId").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("resourceLocation").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("occurredDateTime").ToString());
-                Console.WriteLine(result.GetProperty("traceId").ToString());
-                Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("etag").ToString());
+                Console.WriteLine(result[0].GetProperty("operationId").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceLocation").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("occurredDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("traceId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("etag").ToString());
             }
         }
 
@@ -742,17 +742,17 @@ public void Example_GetOperationStatuses_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOperationStatuses_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetOperationStatusesAsync())
+            await foreach (BinaryData item in client.GetOperationStatusesAsync())
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("operationId").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("operationId").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
             }
         }
 
@@ -760,32 +760,32 @@ public async Task Example_GetOperationStatuses_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetOperationStatuses_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            await foreach (var item in client.GetOperationStatusesAsync("<filter>", 1234))
+            await foreach (BinaryData item in client.GetOperationStatusesAsync(filter: "<filter>", top: 1234))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("operationId").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("update").GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("resourceLocation").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("occurredDateTime").ToString());
-                Console.WriteLine(result.GetProperty("traceId").ToString());
-                Console.WriteLine(result.GetProperty("lastActionDateTime").ToString());
-                Console.WriteLine(result.GetProperty("createdDateTime").ToString());
-                Console.WriteLine(result.GetProperty("etag").ToString());
+                Console.WriteLine(result[0].GetProperty("operationId").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("provider").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("updateId").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("update").GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceLocation").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("innererror").GetProperty("errorDetail").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("occurredDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("traceId").ToString());
+                Console.WriteLine(result[0].GetProperty("lastActionDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("createdDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("etag").ToString());
             }
         }
 
@@ -793,166 +793,166 @@ public async Task Example_GetOperationStatuses_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            var operation = client.DeleteUpdate(WaitUntil.Completed, "<provider>", "<name>", "<version>");
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.DeleteUpdate(WaitUntil.Completed, "<provider>", "<name>", "<version>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
-
-            var operation = client.DeleteUpdate(WaitUntil.Completed, "<provider>", "<name>", "<version>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = client.DeleteUpdate(WaitUntil.Completed, "<provider>", "<name>", "<version>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
-
-            var operation = await client.DeleteUpdateAsync(WaitUntil.Completed, "<provider>", "<name>", "<version>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.DeleteUpdateAsync(WaitUntil.Completed, "<provider>", "<name>", "<version>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            var operation = await client.DeleteUpdateAsync(WaitUntil.Completed, "<provider>", "<name>", "<version>");
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            Operation operation = await client.DeleteUpdateAsync(WaitUntil.Completed, "<provider>", "<name>", "<version>");
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_StartImportUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
-
-            var data = new[] {
-    new {
-        importManifest = new {
-            url = "<url>",
-            sizeInBytes = 1234L,
-            hashes = new {
-                key = "<String>",
-            },
-        },
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            var operation = client.StartImportUpdate(WaitUntil.Completed, RequestContent.Create(data));
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["importManifest"] = new Dictionary<string, object>()
+{
+["url"] = "<url>",
+["sizeInBytes"] = 1234L,
+["hashes"] = new Dictionary<string, object>()
+{
+["key"] = "<hashes>",
+},
+},
+}
+});
+            Operation operation = client.StartImportUpdate(WaitUntil.Completed, content);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_StartImportUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
-
-            var data = new[] {
-    new {
-        importManifest = new {
-            url = "<url>",
-            sizeInBytes = 1234L,
-            hashes = new {
-                key = "<String>",
-            },
-        },
-        friendlyName = "<friendlyName>",
-        files = new[] {
-            new {
-                filename = "<filename>",
-                url = "<url>",
-            }
-        },
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            var operation = client.StartImportUpdate(WaitUntil.Completed, RequestContent.Create(data));
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["importManifest"] = new Dictionary<string, object>()
+{
+["url"] = "<url>",
+["sizeInBytes"] = 1234L,
+["hashes"] = new Dictionary<string, object>()
+{
+["key"] = "<hashes>",
+},
+},
+["friendlyName"] = "<friendlyName>",
+["files"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["filename"] = "<filename>",
+["url"] = "<url>",
+}
+},
+}
+});
+            Operation operation = client.StartImportUpdate(WaitUntil.Completed, content);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_StartImportUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
-
-            var data = new[] {
-    new {
-        importManifest = new {
-            url = "<url>",
-            sizeInBytes = 1234L,
-            hashes = new {
-                key = "<String>",
-            },
-        },
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            var operation = await client.StartImportUpdateAsync(WaitUntil.Completed, RequestContent.Create(data));
-
-            Console.WriteLine(operation.GetRawResponse().Status);
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["importManifest"] = new Dictionary<string, object>()
+{
+["url"] = "<url>",
+["sizeInBytes"] = 1234L,
+["hashes"] = new Dictionary<string, object>()
+{
+["key"] = "<hashes>",
+},
+},
+}
+});
+            Operation operation = await client.StartImportUpdateAsync(WaitUntil.Completed, content);
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_StartImportUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new DeviceUpdateClient(endpoint, "<instanceId>", credential);
-
-            var data = new[] {
-    new {
-        importManifest = new {
-            url = "<url>",
-            sizeInBytes = 1234L,
-            hashes = new {
-                key = "<String>",
-            },
-        },
-        friendlyName = "<friendlyName>",
-        files = new[] {
-            new {
-                filename = "<filename>",
-                url = "<url>",
-            }
-        },
-    }
-};
-
-            var operation = await client.StartImportUpdateAsync(WaitUntil.Completed, RequestContent.Create(data));
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            DeviceUpdateClient client = new DeviceUpdateClient(endpoint, "<InstanceId>", credential);
 
-            Console.WriteLine(operation.GetRawResponse().Status);
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["importManifest"] = new Dictionary<string, object>()
+{
+["url"] = "<url>",
+["sizeInBytes"] = 1234L,
+["hashes"] = new Dictionary<string, object>()
+{
+["key"] = "<hashes>",
+},
+},
+["friendlyName"] = "<friendlyName>",
+["files"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["filename"] = "<filename>",
+["url"] = "<url>",
+}
+},
+}
+});
+            Operation operation = await client.StartImportUpdateAsync(WaitUntil.Completed, content);
         }
     }
 }
diff --git a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/ArmHardwareSecurityModulesModelFactory.cs b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/ArmHardwareSecurityModulesModelFactory.cs
index 8b7058d6e372..8f635ae7f5ad 100644
--- a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/ArmHardwareSecurityModulesModelFactory.cs
+++ b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/ArmHardwareSecurityModulesModelFactory.cs
@@ -104,7 +104,7 @@ public static DedicatedHsmData DedicatedHsmData(ResourceIdentifier id = null, st
         /// <param name="id"> The ARM resource id in the form of /subscriptions/{SubscriptionId}/resourceGroups/{ResourceGroupName}/... </param>
         /// <param name="privateIPAddress"> Private Ip address of the interface. </param>
         /// <returns> A new <see cref="Models.NetworkInterface"/> instance for mocking. </returns>
-        public static NetworkInterface NetworkInterface(ResourceIdentifier id = null, string privateIPAddress = null)
+        public static NetworkInterface NetworkInterface(string id = null, string privateIPAddress = null)
         {
             return new NetworkInterface(id, privateIPAddress);
         }
diff --git a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/CloudHsmClusterCollection.cs b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/CloudHsmClusterCollection.cs
index aba89cb75239..ef895e9722e9 100644
--- a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/CloudHsmClusterCollection.cs
+++ b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/CloudHsmClusterCollection.cs
@@ -11,6 +11,7 @@
 using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
+using Autorest.CSharp.Core;
 using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
@@ -229,7 +230,7 @@ public virtual AsyncPageable<CloudHsmClusterResource> GetAllAsync(string skiptok
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => _cloudHsmClusterRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, skiptoken);
             HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _cloudHsmClusterRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, skiptoken);
-            return PageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new CloudHsmClusterResource(Client, CloudHsmClusterData.DeserializeCloudHsmClusterData(e)), _cloudHsmClusterClientDiagnostics, Pipeline, "CloudHsmClusterCollection.GetAll", "value", "nextLink", cancellationToken);
+            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new CloudHsmClusterResource(Client, CloudHsmClusterData.DeserializeCloudHsmClusterData(e)), _cloudHsmClusterClientDiagnostics, Pipeline, "CloudHsmClusterCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -252,7 +253,7 @@ public virtual Pageable<CloudHsmClusterResource> GetAll(string skiptoken = null,
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => _cloudHsmClusterRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, skiptoken);
             HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _cloudHsmClusterRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, skiptoken);
-            return PageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new CloudHsmClusterResource(Client, CloudHsmClusterData.DeserializeCloudHsmClusterData(e)), _cloudHsmClusterClientDiagnostics, Pipeline, "CloudHsmClusterCollection.GetAll", "value", "nextLink", cancellationToken);
+            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new CloudHsmClusterResource(Client, CloudHsmClusterData.DeserializeCloudHsmClusterData(e)), _cloudHsmClusterClientDiagnostics, Pipeline, "CloudHsmClusterCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
diff --git a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/CloudHsmClusterData.cs b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/CloudHsmClusterData.cs
index db1e49baa2be..7376eaf6b51d 100644
--- a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/CloudHsmClusterData.cs
+++ b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/CloudHsmClusterData.cs
@@ -22,7 +22,7 @@ public partial class CloudHsmClusterData : TrackedResourceData
         /// <param name="location"> The location. </param>
         public CloudHsmClusterData(AzureLocation location) : base(location)
         {
-            HsmProperties = new ChangeTrackingList<CloudHsmProperties>();
+            Hsms = new ChangeTrackingList<CloudHsmProperties>();
             PrivateEndpointConnections = new ChangeTrackingList<HardwareSecurityModulesPrivateEndpointConnectionData>();
         }
 
@@ -45,7 +45,7 @@ internal CloudHsmClusterData(ResourceIdentifier id, string name, ResourceType re
             ProvisioningState = provisioningState;
             AutoGeneratedDomainNameLabelScope = autoGeneratedDomainNameLabelScope;
             SecurityDomain = securityDomain;
-            HsmProperties = hsms;
+            Hsms = hsms;
             PublicNetworkAccess = publicNetworkAccess;
             PrivateEndpointConnections = privateEndpointConnections;
             Sku = sku;
@@ -58,7 +58,7 @@ internal CloudHsmClusterData(ResourceIdentifier id, string name, ResourceType re
         /// <summary> Security domain properties information for Cloud HSM cluster. </summary>
         public CloudHsmClusterSecurityDomainProperties SecurityDomain { get; set; }
         /// <summary> An array of Cloud HSM Cluster's HSMs. </summary>
-        public IList<CloudHsmProperties> HsmProperties { get; }
+        public IList<CloudHsmProperties> Hsms { get; }
         /// <summary> The Cloud HSM Cluster public network access. </summary>
         public string PublicNetworkAccess { get; set; }
         /// <summary> List of private endpoint connection resources. </summary>
diff --git a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/CloudHsmClusterResource.cs b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/CloudHsmClusterResource.cs
index 1455c0c69f69..b73a7bb912f8 100644
--- a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/CloudHsmClusterResource.cs
+++ b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/CloudHsmClusterResource.cs
@@ -10,6 +10,7 @@
 using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
+using Autorest.CSharp.Core;
 using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
@@ -372,7 +373,7 @@ public virtual ArmOperation<CloudHsmClusterResource> Update(WaitUntil waitUntil,
         public virtual AsyncPageable<HardwareSecurityModulesPrivateLinkResource> GetCloudHsmClusterPrivateLinkResourcesAsync(CancellationToken cancellationToken = default)
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => _cloudHsmClusterPrivateLinkResourcesRestClient.CreateListByCloudHsmClusterRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            return PageableHelpers.CreateAsyncPageable(FirstPageRequest, null, HardwareSecurityModulesPrivateLinkResource.DeserializeHardwareSecurityModulesPrivateLinkResource, _cloudHsmClusterPrivateLinkResourcesClientDiagnostics, Pipeline, "CloudHsmClusterResource.GetCloudHsmClusterPrivateLinkResources", "value", null, cancellationToken);
+            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, null, HardwareSecurityModulesPrivateLinkResource.DeserializeHardwareSecurityModulesPrivateLinkResource, _cloudHsmClusterPrivateLinkResourcesClientDiagnostics, Pipeline, "CloudHsmClusterResource.GetCloudHsmClusterPrivateLinkResources", "value", null, cancellationToken);
         }
 
         /// <summary>
@@ -393,7 +394,7 @@ public virtual AsyncPageable<HardwareSecurityModulesPrivateLinkResource> GetClou
         public virtual Pageable<HardwareSecurityModulesPrivateLinkResource> GetCloudHsmClusterPrivateLinkResources(CancellationToken cancellationToken = default)
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => _cloudHsmClusterPrivateLinkResourcesRestClient.CreateListByCloudHsmClusterRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            return PageableHelpers.CreatePageable(FirstPageRequest, null, HardwareSecurityModulesPrivateLinkResource.DeserializeHardwareSecurityModulesPrivateLinkResource, _cloudHsmClusterPrivateLinkResourcesClientDiagnostics, Pipeline, "CloudHsmClusterResource.GetCloudHsmClusterPrivateLinkResources", "value", null, cancellationToken);
+            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, null, HardwareSecurityModulesPrivateLinkResource.DeserializeHardwareSecurityModulesPrivateLinkResource, _cloudHsmClusterPrivateLinkResourcesClientDiagnostics, Pipeline, "CloudHsmClusterResource.GetCloudHsmClusterPrivateLinkResources", "value", null, cancellationToken);
         }
 
         /// <summary>
diff --git a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/DedicatedHsmCollection.cs b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/DedicatedHsmCollection.cs
index fa9b179d017d..7442dfba44da 100644
--- a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/DedicatedHsmCollection.cs
+++ b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/DedicatedHsmCollection.cs
@@ -11,6 +11,7 @@
 using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
+using Autorest.CSharp.Core;
 using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
@@ -229,7 +230,7 @@ public virtual AsyncPageable<DedicatedHsmResource> GetAllAsync(int? top = null,
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => _dedicatedHsmRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, top);
             HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _dedicatedHsmRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, top);
-            return PageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new DedicatedHsmResource(Client, DedicatedHsmData.DeserializeDedicatedHsmData(e)), _dedicatedHsmClientDiagnostics, Pipeline, "DedicatedHsmCollection.GetAll", "value", "nextLink", cancellationToken);
+            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new DedicatedHsmResource(Client, DedicatedHsmData.DeserializeDedicatedHsmData(e)), _dedicatedHsmClientDiagnostics, Pipeline, "DedicatedHsmCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -252,7 +253,7 @@ public virtual Pageable<DedicatedHsmResource> GetAll(int? top = null, Cancellati
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => _dedicatedHsmRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, top);
             HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _dedicatedHsmRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, top);
-            return PageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new DedicatedHsmResource(Client, DedicatedHsmData.DeserializeDedicatedHsmData(e)), _dedicatedHsmClientDiagnostics, Pipeline, "DedicatedHsmCollection.GetAll", "value", "nextLink", cancellationToken);
+            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new DedicatedHsmResource(Client, DedicatedHsmData.DeserializeDedicatedHsmData(e)), _dedicatedHsmClientDiagnostics, Pipeline, "DedicatedHsmCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
diff --git a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/DedicatedHsmResource.cs b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/DedicatedHsmResource.cs
index 50245691fdf4..098e6d774148 100644
--- a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/DedicatedHsmResource.cs
+++ b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/DedicatedHsmResource.cs
@@ -10,6 +10,7 @@
 using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
+using Autorest.CSharp.Core;
 using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
@@ -316,7 +317,7 @@ public virtual AsyncPageable<OutboundEnvironmentEndpoint> GetOutboundNetworkDepe
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => _dedicatedHsmRestClient.CreateListOutboundNetworkDependenciesEndpointsRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
             HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _dedicatedHsmRestClient.CreateListOutboundNetworkDependenciesEndpointsNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            return PageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, OutboundEnvironmentEndpoint.DeserializeOutboundEnvironmentEndpoint, _dedicatedHsmClientDiagnostics, Pipeline, "DedicatedHsmResource.GetOutboundNetworkDependenciesEndpoints", "value", "nextLink", cancellationToken);
+            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, OutboundEnvironmentEndpoint.DeserializeOutboundEnvironmentEndpoint, _dedicatedHsmClientDiagnostics, Pipeline, "DedicatedHsmResource.GetOutboundNetworkDependenciesEndpoints", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -338,7 +339,7 @@ public virtual Pageable<OutboundEnvironmentEndpoint> GetOutboundNetworkDependenc
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => _dedicatedHsmRestClient.CreateListOutboundNetworkDependenciesEndpointsRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
             HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _dedicatedHsmRestClient.CreateListOutboundNetworkDependenciesEndpointsNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            return PageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, OutboundEnvironmentEndpoint.DeserializeOutboundEnvironmentEndpoint, _dedicatedHsmClientDiagnostics, Pipeline, "DedicatedHsmResource.GetOutboundNetworkDependenciesEndpoints", "value", "nextLink", cancellationToken);
+            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, OutboundEnvironmentEndpoint.DeserializeOutboundEnvironmentEndpoint, _dedicatedHsmClientDiagnostics, Pipeline, "DedicatedHsmResource.GetOutboundNetworkDependenciesEndpoints", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
diff --git a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Extensions/SubscriptionResourceExtensionClient.cs b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Extensions/SubscriptionResourceExtensionClient.cs
index 1bfc12e995f8..616ea4d5fbc2 100644
--- a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Extensions/SubscriptionResourceExtensionClient.cs
+++ b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Extensions/SubscriptionResourceExtensionClient.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using System.Threading;
+using Autorest.CSharp.Core;
 using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
@@ -64,7 +65,7 @@ public virtual AsyncPageable<CloudHsmClusterResource> GetCloudHsmClustersAsync(s
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => CloudHsmClusterRestClient.CreateListBySubscriptionRequest(Id.SubscriptionId, skiptoken);
             HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CloudHsmClusterRestClient.CreateListBySubscriptionNextPageRequest(nextLink, Id.SubscriptionId, skiptoken);
-            return PageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new CloudHsmClusterResource(Client, CloudHsmClusterData.DeserializeCloudHsmClusterData(e)), CloudHsmClusterClientDiagnostics, Pipeline, "SubscriptionResourceExtensionClient.GetCloudHsmClusters", "value", "nextLink", cancellationToken);
+            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new CloudHsmClusterResource(Client, CloudHsmClusterData.DeserializeCloudHsmClusterData(e)), CloudHsmClusterClientDiagnostics, Pipeline, "SubscriptionResourceExtensionClient.GetCloudHsmClusters", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -87,7 +88,7 @@ public virtual Pageable<CloudHsmClusterResource> GetCloudHsmClusters(string skip
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => CloudHsmClusterRestClient.CreateListBySubscriptionRequest(Id.SubscriptionId, skiptoken);
             HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CloudHsmClusterRestClient.CreateListBySubscriptionNextPageRequest(nextLink, Id.SubscriptionId, skiptoken);
-            return PageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new CloudHsmClusterResource(Client, CloudHsmClusterData.DeserializeCloudHsmClusterData(e)), CloudHsmClusterClientDiagnostics, Pipeline, "SubscriptionResourceExtensionClient.GetCloudHsmClusters", "value", "nextLink", cancellationToken);
+            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new CloudHsmClusterResource(Client, CloudHsmClusterData.DeserializeCloudHsmClusterData(e)), CloudHsmClusterClientDiagnostics, Pipeline, "SubscriptionResourceExtensionClient.GetCloudHsmClusters", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -110,7 +111,7 @@ public virtual AsyncPageable<DedicatedHsmResource> GetDedicatedHsmsAsync(int? to
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => DedicatedHsmRestClient.CreateListBySubscriptionRequest(Id.SubscriptionId, top);
             HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => DedicatedHsmRestClient.CreateListBySubscriptionNextPageRequest(nextLink, Id.SubscriptionId, top);
-            return PageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new DedicatedHsmResource(Client, DedicatedHsmData.DeserializeDedicatedHsmData(e)), DedicatedHsmClientDiagnostics, Pipeline, "SubscriptionResourceExtensionClient.GetDedicatedHsms", "value", "nextLink", cancellationToken);
+            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new DedicatedHsmResource(Client, DedicatedHsmData.DeserializeDedicatedHsmData(e)), DedicatedHsmClientDiagnostics, Pipeline, "SubscriptionResourceExtensionClient.GetDedicatedHsms", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -133,7 +134,7 @@ public virtual Pageable<DedicatedHsmResource> GetDedicatedHsms(int? top = null,
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => DedicatedHsmRestClient.CreateListBySubscriptionRequest(Id.SubscriptionId, top);
             HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => DedicatedHsmRestClient.CreateListBySubscriptionNextPageRequest(nextLink, Id.SubscriptionId, top);
-            return PageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new DedicatedHsmResource(Client, DedicatedHsmData.DeserializeDedicatedHsmData(e)), DedicatedHsmClientDiagnostics, Pipeline, "SubscriptionResourceExtensionClient.GetDedicatedHsms", "value", "nextLink", cancellationToken);
+            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new DedicatedHsmResource(Client, DedicatedHsmData.DeserializeDedicatedHsmData(e)), DedicatedHsmClientDiagnostics, Pipeline, "SubscriptionResourceExtensionClient.GetDedicatedHsms", "value", "nextLink", cancellationToken);
         }
     }
 }
diff --git a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/HardwareSecurityModulesPrivateEndpointConnectionCollection.cs b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/HardwareSecurityModulesPrivateEndpointConnectionCollection.cs
index 78ccc5f837cd..f76015076ddc 100644
--- a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/HardwareSecurityModulesPrivateEndpointConnectionCollection.cs
+++ b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/HardwareSecurityModulesPrivateEndpointConnectionCollection.cs
@@ -11,6 +11,7 @@
 using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
+using Autorest.CSharp.Core;
 using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
@@ -232,7 +233,7 @@ public virtual AsyncPageable<HardwareSecurityModulesPrivateEndpointConnectionRes
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => _hardwareSecurityModulesPrivateEndpointConnectionPrivateEndpointConnectionsRestClient.CreateListByCloudHsmClusterRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
             HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _hardwareSecurityModulesPrivateEndpointConnectionPrivateEndpointConnectionsRestClient.CreateListByCloudHsmClusterNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            return PageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new HardwareSecurityModulesPrivateEndpointConnectionResource(Client, HardwareSecurityModulesPrivateEndpointConnectionData.DeserializeHardwareSecurityModulesPrivateEndpointConnectionData(e)), _hardwareSecurityModulesPrivateEndpointConnectionPrivateEndpointConnectionsClientDiagnostics, Pipeline, "HardwareSecurityModulesPrivateEndpointConnectionCollection.GetAll", "value", "nextLink", cancellationToken);
+            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new HardwareSecurityModulesPrivateEndpointConnectionResource(Client, HardwareSecurityModulesPrivateEndpointConnectionData.DeserializeHardwareSecurityModulesPrivateEndpointConnectionData(e)), _hardwareSecurityModulesPrivateEndpointConnectionPrivateEndpointConnectionsClientDiagnostics, Pipeline, "HardwareSecurityModulesPrivateEndpointConnectionCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -254,7 +255,7 @@ public virtual Pageable<HardwareSecurityModulesPrivateEndpointConnectionResource
         {
             HttpMessage FirstPageRequest(int? pageSizeHint) => _hardwareSecurityModulesPrivateEndpointConnectionPrivateEndpointConnectionsRestClient.CreateListByCloudHsmClusterRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
             HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _hardwareSecurityModulesPrivateEndpointConnectionPrivateEndpointConnectionsRestClient.CreateListByCloudHsmClusterNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            return PageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new HardwareSecurityModulesPrivateEndpointConnectionResource(Client, HardwareSecurityModulesPrivateEndpointConnectionData.DeserializeHardwareSecurityModulesPrivateEndpointConnectionData(e)), _hardwareSecurityModulesPrivateEndpointConnectionPrivateEndpointConnectionsClientDiagnostics, Pipeline, "HardwareSecurityModulesPrivateEndpointConnectionCollection.GetAll", "value", "nextLink", cancellationToken);
+            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new HardwareSecurityModulesPrivateEndpointConnectionResource(Client, HardwareSecurityModulesPrivateEndpointConnectionData.DeserializeHardwareSecurityModulesPrivateEndpointConnectionData(e)), _hardwareSecurityModulesPrivateEndpointConnectionPrivateEndpointConnectionsClientDiagnostics, Pipeline, "HardwareSecurityModulesPrivateEndpointConnectionCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
diff --git a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/CloudHsmClusterData.Serialization.cs b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/CloudHsmClusterData.Serialization.cs
index 3c5419933e2d..0a6f30487337 100644
--- a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/CloudHsmClusterData.Serialization.cs
+++ b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/CloudHsmClusterData.Serialization.cs
@@ -53,11 +53,11 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer)
                 writer.WritePropertyName("securityDomain"u8);
                 writer.WriteObjectValue(SecurityDomain);
             }
-            if (Optional.IsCollectionDefined(HsmProperties))
+            if (Optional.IsCollectionDefined(Hsms))
             {
                 writer.WritePropertyName("hsms"u8);
                 writer.WriteStartArray();
-                foreach (var item in HsmProperties)
+                foreach (var item in Hsms)
                 {
                     writer.WriteObjectValue(item);
                 }
diff --git a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/NetworkInterface.Serialization.cs b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/NetworkInterface.Serialization.cs
index 5c066cb1d5d7..24722fdb63a9 100644
--- a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/NetworkInterface.Serialization.cs
+++ b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/NetworkInterface.Serialization.cs
@@ -29,17 +29,13 @@ internal static NetworkInterface DeserializeNetworkInterface(JsonElement element
             {
                 return null;
             }
-            Optional<ResourceIdentifier> id = default;
+            Optional<string> id = default;
             Optional<string> privateIPAddress = default;
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("id"u8))
                 {
-                    if(property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    id = new ResourceIdentifier(property.Value.GetString());
+                    id = property.Value.GetString();
                     continue;
                 }
                 if (property.NameEquals("privateIpAddress"u8))
diff --git a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/NetworkInterface.cs b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/NetworkInterface.cs
index de1fdd959569..d8410d7f88a8 100644
--- a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/NetworkInterface.cs
+++ b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/NetworkInterface.cs
@@ -5,8 +5,6 @@
 
 #nullable disable
 
-using Azure.Core;
-
 namespace Azure.ResourceManager.HardwareSecurityModules.Models
 {
     /// <summary> The network interface definition. </summary>
@@ -20,14 +18,14 @@ public NetworkInterface()
         /// <summary> Initializes a new instance of NetworkInterface. </summary>
         /// <param name="id"> The ARM resource id in the form of /subscriptions/{SubscriptionId}/resourceGroups/{ResourceGroupName}/... </param>
         /// <param name="privateIPAddress"> Private Ip address of the interface. </param>
-        internal NetworkInterface(ResourceIdentifier id, string privateIPAddress)
+        internal NetworkInterface(string id, string privateIPAddress)
         {
             Id = id;
             PrivateIPAddress = privateIPAddress;
         }
 
         /// <summary> The ARM resource id in the form of /subscriptions/{SubscriptionId}/resourceGroups/{ResourceGroupName}/... </summary>
-        public ResourceIdentifier Id { get; }
+        public string Id { get; }
         /// <summary> Private Ip address of the interface. </summary>
         public string PrivateIPAddress { get; set; }
     }
diff --git a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/OutboundEnvironmentEndpointGroup.Serialization.cs b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/OutboundEnvironmentEndpointCollection.Serialization.cs
similarity index 82%
rename from sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/OutboundEnvironmentEndpointGroup.Serialization.cs
rename to sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/OutboundEnvironmentEndpointCollection.Serialization.cs
index 55cee527cadf..490828bafefa 100644
--- a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/OutboundEnvironmentEndpointGroup.Serialization.cs
+++ b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/OutboundEnvironmentEndpointCollection.Serialization.cs
@@ -11,9 +11,9 @@
 
 namespace Azure.ResourceManager.HardwareSecurityModules.Models
 {
-    internal partial class OutboundEnvironmentEndpointGroup
+    internal partial class OutboundEnvironmentEndpointCollection
     {
-        internal static OutboundEnvironmentEndpointGroup DeserializeOutboundEnvironmentEndpointGroup(JsonElement element)
+        internal static OutboundEnvironmentEndpointCollection DeserializeOutboundEnvironmentEndpointCollection(JsonElement element)
         {
             if (element.ValueKind == JsonValueKind.Null)
             {
@@ -39,7 +39,7 @@ internal static OutboundEnvironmentEndpointGroup DeserializeOutboundEnvironmentE
                     continue;
                 }
             }
-            return new OutboundEnvironmentEndpointGroup(value, nextLink.Value);
+            return new OutboundEnvironmentEndpointCollection(value, nextLink.Value);
         }
     }
 }
diff --git a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/OutboundEnvironmentEndpointGroup.cs b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/OutboundEnvironmentEndpointCollection.cs
similarity index 77%
rename from sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/OutboundEnvironmentEndpointGroup.cs
rename to sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/OutboundEnvironmentEndpointCollection.cs
index 644c7bdda876..898cc501153c 100644
--- a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/OutboundEnvironmentEndpointGroup.cs
+++ b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/Models/OutboundEnvironmentEndpointCollection.cs
@@ -13,22 +13,22 @@
 namespace Azure.ResourceManager.HardwareSecurityModules.Models
 {
     /// <summary> Collection of OutboundEnvironmentEndpoint. </summary>
-    internal partial class OutboundEnvironmentEndpointGroup
+    internal partial class OutboundEnvironmentEndpointCollection
     {
-        /// <summary> Initializes a new instance of OutboundEnvironmentEndpointGroup. </summary>
+        /// <summary> Initializes a new instance of OutboundEnvironmentEndpointCollection. </summary>
         /// <param name="value"> Collection of resources. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        internal OutboundEnvironmentEndpointGroup(IEnumerable<OutboundEnvironmentEndpoint> value)
+        internal OutboundEnvironmentEndpointCollection(IEnumerable<OutboundEnvironmentEndpoint> value)
         {
             Argument.AssertNotNull(value, nameof(value));
 
             Value = value.ToList();
         }
 
-        /// <summary> Initializes a new instance of OutboundEnvironmentEndpointGroup. </summary>
+        /// <summary> Initializes a new instance of OutboundEnvironmentEndpointCollection. </summary>
         /// <param name="value"> Collection of resources. </param>
         /// <param name="nextLink"> Link to next page of resources. </param>
-        internal OutboundEnvironmentEndpointGroup(IReadOnlyList<OutboundEnvironmentEndpoint> value, string nextLink)
+        internal OutboundEnvironmentEndpointCollection(IReadOnlyList<OutboundEnvironmentEndpoint> value, string nextLink)
         {
             Value = value;
             NextLink = nextLink;
diff --git a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/RestOperations/DedicatedHsmRestOperations.cs b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/RestOperations/DedicatedHsmRestOperations.cs
index d51785f35444..c01dc57991b6 100644
--- a/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/RestOperations/DedicatedHsmRestOperations.cs
+++ b/sdk/hardwaresecuritymodules/Azure.ResourceManager.HardwareSecurityModules/src/Generated/RestOperations/DedicatedHsmRestOperations.cs
@@ -525,7 +525,7 @@ internal HttpMessage CreateListOutboundNetworkDependenciesEndpointsRequest(strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="name"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="name"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<OutboundEnvironmentEndpointGroup>> ListOutboundNetworkDependenciesEndpointsAsync(string subscriptionId, string resourceGroupName, string name, CancellationToken cancellationToken = default)
+        public async Task<Response<OutboundEnvironmentEndpointCollection>> ListOutboundNetworkDependenciesEndpointsAsync(string subscriptionId, string resourceGroupName, string name, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -537,9 +537,9 @@ public async Task<Response<OutboundEnvironmentEndpointGroup>> ListOutboundNetwor
             {
                 case 200:
                     {
-                        OutboundEnvironmentEndpointGroup value = default;
+                        OutboundEnvironmentEndpointCollection value = default;
                         using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, default, cancellationToken).ConfigureAwait(false);
-                        value = OutboundEnvironmentEndpointGroup.DeserializeOutboundEnvironmentEndpointGroup(document.RootElement);
+                        value = OutboundEnvironmentEndpointCollection.DeserializeOutboundEnvironmentEndpointCollection(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 default:
@@ -554,7 +554,7 @@ public async Task<Response<OutboundEnvironmentEndpointGroup>> ListOutboundNetwor
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="name"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="name"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<OutboundEnvironmentEndpointGroup> ListOutboundNetworkDependenciesEndpoints(string subscriptionId, string resourceGroupName, string name, CancellationToken cancellationToken = default)
+        public Response<OutboundEnvironmentEndpointCollection> ListOutboundNetworkDependenciesEndpoints(string subscriptionId, string resourceGroupName, string name, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -566,9 +566,9 @@ public Response<OutboundEnvironmentEndpointGroup> ListOutboundNetworkDependencie
             {
                 case 200:
                     {
-                        OutboundEnvironmentEndpointGroup value = default;
+                        OutboundEnvironmentEndpointCollection value = default;
                         using var document = JsonDocument.Parse(message.Response.ContentStream);
-                        value = OutboundEnvironmentEndpointGroup.DeserializeOutboundEnvironmentEndpointGroup(document.RootElement);
+                        value = OutboundEnvironmentEndpointCollection.DeserializeOutboundEnvironmentEndpointCollection(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 default:
@@ -742,7 +742,7 @@ internal HttpMessage CreateListOutboundNetworkDependenciesEndpointsNextPageReque
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="nextLink"/>, <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="name"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="name"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<OutboundEnvironmentEndpointGroup>> ListOutboundNetworkDependenciesEndpointsNextPageAsync(string nextLink, string subscriptionId, string resourceGroupName, string name, CancellationToken cancellationToken = default)
+        public async Task<Response<OutboundEnvironmentEndpointCollection>> ListOutboundNetworkDependenciesEndpointsNextPageAsync(string nextLink, string subscriptionId, string resourceGroupName, string name, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(nextLink, nameof(nextLink));
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
@@ -755,9 +755,9 @@ public async Task<Response<OutboundEnvironmentEndpointGroup>> ListOutboundNetwor
             {
                 case 200:
                     {
-                        OutboundEnvironmentEndpointGroup value = default;
+                        OutboundEnvironmentEndpointCollection value = default;
                         using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, default, cancellationToken).ConfigureAwait(false);
-                        value = OutboundEnvironmentEndpointGroup.DeserializeOutboundEnvironmentEndpointGroup(document.RootElement);
+                        value = OutboundEnvironmentEndpointCollection.DeserializeOutboundEnvironmentEndpointCollection(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 default:
@@ -773,7 +773,7 @@ public async Task<Response<OutboundEnvironmentEndpointGroup>> ListOutboundNetwor
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="nextLink"/>, <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="name"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="name"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<OutboundEnvironmentEndpointGroup> ListOutboundNetworkDependenciesEndpointsNextPage(string nextLink, string subscriptionId, string resourceGroupName, string name, CancellationToken cancellationToken = default)
+        public Response<OutboundEnvironmentEndpointCollection> ListOutboundNetworkDependenciesEndpointsNextPage(string nextLink, string subscriptionId, string resourceGroupName, string name, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(nextLink, nameof(nextLink));
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
@@ -786,9 +786,9 @@ public Response<OutboundEnvironmentEndpointGroup> ListOutboundNetworkDependencie
             {
                 case 200:
                     {
-                        OutboundEnvironmentEndpointGroup value = default;
+                        OutboundEnvironmentEndpointCollection value = default;
                         using var document = JsonDocument.Parse(message.Response.ContentStream);
-                        value = OutboundEnvironmentEndpointGroup.DeserializeOutboundEnvironmentEndpointGroup(document.RootElement);
+                        value = OutboundEnvironmentEndpointCollection.DeserializeOutboundEnvironmentEndpointCollection(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 default:
diff --git a/sdk/healthinsights/Azure.Health.Insights.CancerProfiling/src/Generated/Docs/CancerProfilingClient.xml b/sdk/healthinsights/Azure.Health.Insights.CancerProfiling/src/Generated/Docs/CancerProfilingClient.xml
index aea44f1a5d63..26843475e9e5 100644
--- a/sdk/healthinsights/Azure.Health.Insights.CancerProfiling/src/Generated/Docs/CancerProfilingClient.xml
+++ b/sdk/healthinsights/Azure.Health.Insights.CancerProfiling/src/Generated/Docs/CancerProfilingClient.xml
@@ -2,128 +2,156 @@
 <doc>
   <members>
     <member name="InferCancerProfileAsync(WaitUntil,OncoPhenotypeData,CancellationToken)">
-<example>
-This sample shows how to call InferCancerProfileAsync with required parameters.
+      <example>
+This sample shows how to call InferCancerProfileAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new CancerProfilingClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
 
-var oncoPhenotypeData = new OncoPhenotypeData(new PatientRecord[] 
+OncoPhenotypeData oncoPhenotypeData = new OncoPhenotypeData(new List<PatientRecord>()
 {
-    new PatientRecord("<id>")
+new PatientRecord("<id>")
+});
+Operation<OncoPhenotypeResult> operation = await client.InferCancerProfileAsync(WaitUntil.Completed, oncoPhenotypeData);
+OncoPhenotypeResult responseData = operation.Value;
+]]></code>
+This sample shows how to call InferCancerProfileAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
+
+OncoPhenotypeData oncoPhenotypeData = new OncoPhenotypeData(new List<PatientRecord>()
+{
+new PatientRecord("<id>")
 {
-        Info = new PatientInfo()
+Info = new PatientInfo()
 {
-            Sex = PatientInfoSex.Female,
-            BirthDate = DateTimeOffset.UtcNow,
-            ClinicalInfo = 
+Sex = PatientInfoSex.Female,
+BirthDate = DateTimeOffset.Parse("2022-05-10"),
+ClinicalInfo =
 {
-                new ClinicalCodedElement("<system>", "<code>")
+new ClinicalCodedElement("<system>","<code>")
 {
-                    Name = "<Name>",
-                    Value = "<Value>",
-                }
-            },
-        },
-        Data = 
+Name = "<name>",
+Value = "<value>",
+}
+},
+},
+Data =
 {
-            new PatientDocument(DocumentType.Note, "<id>", new DocumentContent(DocumentContentSourceType.Inline, "<value>"))
+new PatientDocument(DocumentType.Note,"<id>",new DocumentContent(DocumentContentSourceType.Inline,"<value>"))
 {
-                ClinicalType = ClinicalDocumentType.Consultation,
-                Language = "<Language>",
-                CreatedDateTime = DateTimeOffset.UtcNow,
-            }
-        },
-    }
+ClinicalType = ClinicalDocumentType.Consultation,
+Language = "<language>",
+CreatedDateTime = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
+},
+}
 })
 {
     Configuration = new OncoPhenotypeModelConfiguration()
-{
+    {
         Verbose = true,
         IncludeEvidence = true,
-        InferenceTypes = 
+        InferenceTypes =
 {
-            OncoPhenotypeInferenceType.TumorSite
-        },
+OncoPhenotypeInferenceType.TumorSite
+},
         CheckForCancerCase = true,
     },
 };
-var operation = await client.InferCancerProfileAsync(WaitUntil.Completed, oncoPhenotypeData);
-]]></code>
-</example>
+Operation<OncoPhenotypeResult> operation = await client.InferCancerProfileAsync(WaitUntil.Completed, oncoPhenotypeData);
+OncoPhenotypeResult responseData = operation.Value;
+]]></code></example>
     </member>
     <member name="InferCancerProfile(WaitUntil,OncoPhenotypeData,CancellationToken)">
-<example>
-This sample shows how to call InferCancerProfile with required parameters.
+      <example>
+This sample shows how to call InferCancerProfile.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new CancerProfilingClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
 
-var oncoPhenotypeData = new OncoPhenotypeData(new PatientRecord[] 
+OncoPhenotypeData oncoPhenotypeData = new OncoPhenotypeData(new List<PatientRecord>()
 {
-    new PatientRecord("<id>")
+new PatientRecord("<id>")
+});
+Operation<OncoPhenotypeResult> operation = client.InferCancerProfile(WaitUntil.Completed, oncoPhenotypeData);
+OncoPhenotypeResult responseData = operation.Value;
+]]></code>
+This sample shows how to call InferCancerProfile with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
+
+OncoPhenotypeData oncoPhenotypeData = new OncoPhenotypeData(new List<PatientRecord>()
+{
+new PatientRecord("<id>")
 {
-        Info = new PatientInfo()
+Info = new PatientInfo()
 {
-            Sex = PatientInfoSex.Female,
-            BirthDate = DateTimeOffset.UtcNow,
-            ClinicalInfo = 
+Sex = PatientInfoSex.Female,
+BirthDate = DateTimeOffset.Parse("2022-05-10"),
+ClinicalInfo =
 {
-                new ClinicalCodedElement("<system>", "<code>")
+new ClinicalCodedElement("<system>","<code>")
 {
-                    Name = "<Name>",
-                    Value = "<Value>",
-                }
-            },
-        },
-        Data = 
+Name = "<name>",
+Value = "<value>",
+}
+},
+},
+Data =
 {
-            new PatientDocument(DocumentType.Note, "<id>", new DocumentContent(DocumentContentSourceType.Inline, "<value>"))
+new PatientDocument(DocumentType.Note,"<id>",new DocumentContent(DocumentContentSourceType.Inline,"<value>"))
 {
-                ClinicalType = ClinicalDocumentType.Consultation,
-                Language = "<Language>",
-                CreatedDateTime = DateTimeOffset.UtcNow,
-            }
-        },
-    }
+ClinicalType = ClinicalDocumentType.Consultation,
+Language = "<language>",
+CreatedDateTime = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
+},
+}
 })
 {
     Configuration = new OncoPhenotypeModelConfiguration()
-{
+    {
         Verbose = true,
         IncludeEvidence = true,
-        InferenceTypes = 
+        InferenceTypes =
 {
-            OncoPhenotypeInferenceType.TumorSite
-        },
+OncoPhenotypeInferenceType.TumorSite
+},
         CheckForCancerCase = true,
     },
 };
-var operation = client.InferCancerProfile(WaitUntil.Completed, oncoPhenotypeData);
-]]></code>
-</example>
+Operation<OncoPhenotypeResult> operation = client.InferCancerProfile(WaitUntil.Completed, oncoPhenotypeData);
+OncoPhenotypeResult responseData = operation.Value;
+]]></code></example>
     </member>
     <member name="InferCancerProfileAsync(WaitUntil,RequestContent,RequestContext)">
-<example>
-This sample shows how to call InferCancerProfileAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call InferCancerProfileAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new CancerProfilingClient(endpoint, credential);
-
-var data = new {
-    patients = new[] {
-        new {
-            id = "<id>",
-        }
-    },
-};
-
-var operation = await client.InferCancerProfileAsync(WaitUntil.Completed, RequestContent.Create(data));
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+}
+},
+});
+Operation<BinaryData> operation = await client.InferCancerProfileAsync(WaitUntil.Completed, content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -131,56 +159,66 @@ Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastUpdateDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call InferCancerProfileAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call InferCancerProfileAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new CancerProfilingClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
 
-var data = new {
-    patients = new[] {
-        new {
-            id = "<id>",
-            info = new {
-                sex = "female",
-                birthDate = "2022-05-10",
-                clinicalInfo = new[] {
-                    new {
-                        system = "<system>",
-                        code = "<code>",
-                        name = "<name>",
-                        value = "<value>",
-                    }
-                },
-            },
-            data = new[] {
-                new {
-                    type = "note",
-                    clinicalType = "consultation",
-                    id = "<id>",
-                    language = "<language>",
-                    createdDateTime = "2022-05-10T14:57:31.2311892-04:00",
-                    content = new {
-                        sourceType = "inline",
-                        value = "<value>",
-                    },
-                }
-            },
-        }
-    },
-    configuration = new {
-        verbose = true,
-        includeEvidence = true,
-        inferenceTypes = new[] {
-            "tumorSite"
-        },
-        checkForCancerCase = true,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = new Dictionary<string, object>()
+{
+["sex"] = "female",
+["birthDate"] = "2022-05-10",
+["clinicalInfo"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["system"] = "<system>",
+["code"] = "<code>",
+["name"] = "<name>",
+["value"] = "<value>",
+}
+},
+},
+["data"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "note",
+["clinicalType"] = "consultation",
+["id"] = "<id>",
+["language"] = "<language>",
+["createdDateTime"] = "2022-05-10T14:57:31.2311892-04:00",
+["content"] = new Dictionary<string, object>()
+{
+["sourceType"] = "inline",
+["value"] = "<value>",
+},
+}
+},
+}
+},
+    ["configuration"] = new Dictionary<string, object>()
+    {
+        ["verbose"] = true,
+        ["includeEvidence"] = true,
+        ["inferenceTypes"] = new List<object>()
+{
+"tumorSite"
+},
+        ["checkForCancerCase"] = true,
     },
-};
-
-var operation = await client.InferCancerProfileAsync(WaitUntil.Completed, RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = await client.InferCancerProfileAsync(WaitUntil.Completed, content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -207,28 +245,29 @@ Console.WriteLine(result.GetProperty("results").GetProperty("patients")[0].GetPr
 Console.WriteLine(result.GetProperty("results").GetProperty("patients")[0].GetProperty("inferences")[0].GetProperty("evidence")[0].GetProperty("importance").ToString());
 Console.WriteLine(result.GetProperty("results").GetProperty("patients")[0].GetProperty("inferences")[0].GetProperty("caseId").ToString());
 Console.WriteLine(result.GetProperty("results").GetProperty("modelVersion").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="InferCancerProfile(WaitUntil,RequestContent,RequestContext)">
-<example>
-This sample shows how to call InferCancerProfile with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call InferCancerProfile and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new CancerProfilingClient(endpoint, credential);
-
-var data = new {
-    patients = new[] {
-        new {
-            id = "<id>",
-        }
-    },
-};
-
-var operation = client.InferCancerProfile(WaitUntil.Completed, RequestContent.Create(data));
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+}
+},
+});
+Operation<BinaryData> operation = client.InferCancerProfile(WaitUntil.Completed, content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -236,56 +275,66 @@ Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastUpdateDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call InferCancerProfile with all parameters and request content, and how to parse the result.
+This sample shows how to call InferCancerProfile with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new CancerProfilingClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
 
-var data = new {
-    patients = new[] {
-        new {
-            id = "<id>",
-            info = new {
-                sex = "female",
-                birthDate = "2022-05-10",
-                clinicalInfo = new[] {
-                    new {
-                        system = "<system>",
-                        code = "<code>",
-                        name = "<name>",
-                        value = "<value>",
-                    }
-                },
-            },
-            data = new[] {
-                new {
-                    type = "note",
-                    clinicalType = "consultation",
-                    id = "<id>",
-                    language = "<language>",
-                    createdDateTime = "2022-05-10T14:57:31.2311892-04:00",
-                    content = new {
-                        sourceType = "inline",
-                        value = "<value>",
-                    },
-                }
-            },
-        }
-    },
-    configuration = new {
-        verbose = true,
-        includeEvidence = true,
-        inferenceTypes = new[] {
-            "tumorSite"
-        },
-        checkForCancerCase = true,
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = new Dictionary<string, object>()
+{
+["sex"] = "female",
+["birthDate"] = "2022-05-10",
+["clinicalInfo"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["system"] = "<system>",
+["code"] = "<code>",
+["name"] = "<name>",
+["value"] = "<value>",
+}
+},
+},
+["data"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "note",
+["clinicalType"] = "consultation",
+["id"] = "<id>",
+["language"] = "<language>",
+["createdDateTime"] = "2022-05-10T14:57:31.2311892-04:00",
+["content"] = new Dictionary<string, object>()
+{
+["sourceType"] = "inline",
+["value"] = "<value>",
+},
+}
+},
+}
+},
+    ["configuration"] = new Dictionary<string, object>()
+    {
+        ["verbose"] = true,
+        ["includeEvidence"] = true,
+        ["inferenceTypes"] = new List<object>()
+{
+"tumorSite"
+},
+        ["checkForCancerCase"] = true,
     },
-};
-
-var operation = client.InferCancerProfile(WaitUntil.Completed, RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = client.InferCancerProfile(WaitUntil.Completed, content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -312,8 +361,7 @@ Console.WriteLine(result.GetProperty("results").GetProperty("patients")[0].GetPr
 Console.WriteLine(result.GetProperty("results").GetProperty("patients")[0].GetProperty("inferences")[0].GetProperty("evidence")[0].GetProperty("importance").ToString());
 Console.WriteLine(result.GetProperty("results").GetProperty("patients")[0].GetProperty("inferences")[0].GetProperty("caseId").ToString());
 Console.WriteLine(result.GetProperty("results").GetProperty("modelVersion").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/healthinsights/Azure.Health.Insights.CancerProfiling/tests/Generated/Samples/Samples_CancerProfilingClient.cs b/sdk/healthinsights/Azure.Health.Insights.CancerProfiling/tests/Generated/Samples/Samples_CancerProfilingClient.cs
index 44a2402058eb..d054b68df887 100644
--- a/sdk/healthinsights/Azure.Health.Insights.CancerProfiling/tests/Generated/Samples/Samples_CancerProfilingClient.cs
+++ b/sdk/healthinsights/Azure.Health.Insights.CancerProfiling/tests/Generated/Samples/Samples_CancerProfilingClient.cs
@@ -7,11 +7,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
+using Azure.Health.Insights.CancerProfiling;
 using Azure.Identity;
 using NUnit.Framework;
 
@@ -23,22 +23,23 @@ public class Samples_CancerProfilingClient
         [Ignore("Only validating compilation of examples")]
         public void Example_InferCancerProfile()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new CancerProfilingClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                patients = new[] {
-        new {
-            id = "<id>",
-        }
-    },
-            };
-
-            var operation = client.InferCancerProfile(WaitUntil.Completed, RequestContent.Create(data));
-
+                ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+}
+},
+            });
+            Operation<BinaryData> operation = client.InferCancerProfile(WaitUntil.Completed, content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -51,56 +52,64 @@ public void Example_InferCancerProfile()
         [Ignore("Only validating compilation of examples")]
         public void Example_InferCancerProfile_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new CancerProfilingClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                patients = new[] {
-        new {
-            id = "<id>",
-            info = new {
-                sex = "female",
-                birthDate = "2022-05-10",
-                clinicalInfo = new[] {
-                    new {
-                        system = "<system>",
-                        code = "<code>",
-                        name = "<name>",
-                        value = "<value>",
-                    }
-                },
-            },
-            data = new[] {
-                new {
-                    type = "note",
-                    clinicalType = "consultation",
-                    id = "<id>",
-                    language = "<language>",
-                    createdDateTime = "2022-05-10T14:57:31.2311892-04:00",
-                    content = new {
-                        sourceType = "inline",
-                        value = "<value>",
-                    },
-                }
-            },
-        }
-    },
-                configuration = new
+                ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = new Dictionary<string, object>()
+{
+["sex"] = "female",
+["birthDate"] = "2022-05-10",
+["clinicalInfo"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["system"] = "<system>",
+["code"] = "<code>",
+["name"] = "<name>",
+["value"] = "<value>",
+}
+},
+},
+["data"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "note",
+["clinicalType"] = "consultation",
+["id"] = "<id>",
+["language"] = "<language>",
+["createdDateTime"] = "2022-05-10T14:57:31.2311892-04:00",
+["content"] = new Dictionary<string, object>()
+{
+["sourceType"] = "inline",
+["value"] = "<value>",
+},
+}
+},
+}
+},
+                ["configuration"] = new Dictionary<string, object>()
                 {
-                    verbose = true,
-                    includeEvidence = true,
-                    inferenceTypes = new[] {
-            "tumorSite"
-        },
-                    checkForCancerCase = true,
+                    ["verbose"] = true,
+                    ["includeEvidence"] = true,
+                    ["inferenceTypes"] = new List<object>()
+{
+"tumorSite"
+},
+                    ["checkForCancerCase"] = true,
                 },
-            };
-
-            var operation = client.InferCancerProfile(WaitUntil.Completed, RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.InferCancerProfile(WaitUntil.Completed, content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -131,24 +140,93 @@ public void Example_InferCancerProfile_AllParameters()
 
         [Test]
         [Ignore("Only validating compilation of examples")]
-        public async Task Example_InferCancerProfile_Async()
+        public void Example_InferCancerProfile_Convenience()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new CancerProfilingClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
 
-            var data = new
-            {
-                patients = new[] {
-        new {
-            id = "<id>",
+            OncoPhenotypeData oncoPhenotypeData = new OncoPhenotypeData(new List<PatientRecord>()
+{
+new PatientRecord("<id>")
+});
+            Operation<OncoPhenotypeResult> operation = client.InferCancerProfile(WaitUntil.Completed, oncoPhenotypeData);
+            OncoPhenotypeResult responseData = operation.Value;
         }
-    },
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_InferCancerProfile_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
+
+            OncoPhenotypeData oncoPhenotypeData = new OncoPhenotypeData(new List<PatientRecord>()
+{
+new PatientRecord("<id>")
+{
+Info = new PatientInfo()
+{
+Sex = PatientInfoSex.Female,
+BirthDate = DateTimeOffset.Parse("2022-05-10"),
+ClinicalInfo =
+{
+new ClinicalCodedElement("<system>","<code>")
+{
+Name = "<name>",
+Value = "<value>",
+}
+},
+},
+Data =
+{
+new PatientDocument(DocumentType.Note,"<id>",new DocumentContent(DocumentContentSourceType.Inline,"<value>"))
+{
+ClinicalType = ClinicalDocumentType.Consultation,
+Language = "<language>",
+CreatedDateTime = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
+},
+}
+})
+            {
+                Configuration = new OncoPhenotypeModelConfiguration()
+                {
+                    Verbose = true,
+                    IncludeEvidence = true,
+                    InferenceTypes =
+{
+OncoPhenotypeInferenceType.TumorSite
+},
+                    CheckForCancerCase = true,
+                },
             };
+            Operation<OncoPhenotypeResult> operation = client.InferCancerProfile(WaitUntil.Completed, oncoPhenotypeData);
+            OncoPhenotypeResult responseData = operation.Value;
+        }
 
-            var operation = await client.InferCancerProfileAsync(WaitUntil.Completed, RequestContent.Create(data));
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_InferCancerProfile_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
 
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+            {
+                ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+}
+},
+            });
+            Operation<BinaryData> operation = await client.InferCancerProfileAsync(WaitUntil.Completed, content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -161,56 +239,64 @@ public async Task Example_InferCancerProfile_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_InferCancerProfile_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new CancerProfilingClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                patients = new[] {
-        new {
-            id = "<id>",
-            info = new {
-                sex = "female",
-                birthDate = "2022-05-10",
-                clinicalInfo = new[] {
-                    new {
-                        system = "<system>",
-                        code = "<code>",
-                        name = "<name>",
-                        value = "<value>",
-                    }
-                },
-            },
-            data = new[] {
-                new {
-                    type = "note",
-                    clinicalType = "consultation",
-                    id = "<id>",
-                    language = "<language>",
-                    createdDateTime = "2022-05-10T14:57:31.2311892-04:00",
-                    content = new {
-                        sourceType = "inline",
-                        value = "<value>",
-                    },
-                }
-            },
-        }
-    },
-                configuration = new
+                ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = new Dictionary<string, object>()
+{
+["sex"] = "female",
+["birthDate"] = "2022-05-10",
+["clinicalInfo"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["system"] = "<system>",
+["code"] = "<code>",
+["name"] = "<name>",
+["value"] = "<value>",
+}
+},
+},
+["data"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "note",
+["clinicalType"] = "consultation",
+["id"] = "<id>",
+["language"] = "<language>",
+["createdDateTime"] = "2022-05-10T14:57:31.2311892-04:00",
+["content"] = new Dictionary<string, object>()
+{
+["sourceType"] = "inline",
+["value"] = "<value>",
+},
+}
+},
+}
+},
+                ["configuration"] = new Dictionary<string, object>()
                 {
-                    verbose = true,
-                    includeEvidence = true,
-                    inferenceTypes = new[] {
-            "tumorSite"
-        },
-                    checkForCancerCase = true,
+                    ["verbose"] = true,
+                    ["includeEvidence"] = true,
+                    ["inferenceTypes"] = new List<object>()
+{
+"tumorSite"
+},
+                    ["checkForCancerCase"] = true,
                 },
-            };
-
-            var operation = await client.InferCancerProfileAsync(WaitUntil.Completed, RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.InferCancerProfileAsync(WaitUntil.Completed, content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -243,38 +329,54 @@ public async Task Example_InferCancerProfile_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_InferCancerProfile_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new CancerProfilingClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
 
-            var oncoPhenotypeData = new OncoPhenotypeData(new PatientRecord[]
-            {
-    new PatientRecord("<id>")
+            OncoPhenotypeData oncoPhenotypeData = new OncoPhenotypeData(new List<PatientRecord>()
 {
-        Info = new PatientInfo()
+new PatientRecord("<id>")
+});
+            Operation<OncoPhenotypeResult> operation = await client.InferCancerProfileAsync(WaitUntil.Completed, oncoPhenotypeData);
+            OncoPhenotypeResult responseData = operation.Value;
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_InferCancerProfile_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            CancerProfilingClient client = new CancerProfilingClient(endpoint, credential);
+
+            OncoPhenotypeData oncoPhenotypeData = new OncoPhenotypeData(new List<PatientRecord>()
 {
-            Sex = PatientInfoSex.Female,
-            BirthDate = DateTimeOffset.UtcNow,
-            ClinicalInfo =
+new PatientRecord("<id>")
 {
-                new ClinicalCodedElement("<system>", "<code>")
+Info = new PatientInfo()
 {
-                    Name = "<Name>",
-                    Value = "<Value>",
-                }
-            },
-        },
-        Data =
+Sex = PatientInfoSex.Female,
+BirthDate = DateTimeOffset.Parse("2022-05-10"),
+ClinicalInfo =
 {
-            new PatientDocument(DocumentType.Note, "<id>", new DocumentContent(DocumentContentSourceType.Inline, "<value>"))
+new ClinicalCodedElement("<system>","<code>")
 {
-                ClinicalType = ClinicalDocumentType.Consultation,
-                Language = "<Language>",
-                CreatedDateTime = DateTimeOffset.UtcNow,
-            }
-        },
-    }
-            })
+Name = "<name>",
+Value = "<value>",
+}
+},
+},
+Data =
+{
+new PatientDocument(DocumentType.Note,"<id>",new DocumentContent(DocumentContentSourceType.Inline,"<value>"))
+{
+ClinicalType = ClinicalDocumentType.Consultation,
+Language = "<language>",
+CreatedDateTime = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
+},
+}
+})
             {
                 Configuration = new OncoPhenotypeModelConfiguration()
                 {
@@ -282,12 +384,13 @@ public async Task Example_InferCancerProfile_Convenience_Async()
                     IncludeEvidence = true,
                     InferenceTypes =
 {
-            OncoPhenotypeInferenceType.TumorSite
-        },
+OncoPhenotypeInferenceType.TumorSite
+},
                     CheckForCancerCase = true,
                 },
             };
-            var operation = await client.InferCancerProfileAsync(WaitUntil.Completed, oncoPhenotypeData);
+            Operation<OncoPhenotypeResult> operation = await client.InferCancerProfileAsync(WaitUntil.Completed, oncoPhenotypeData);
+            OncoPhenotypeResult responseData = operation.Value;
         }
     }
 }
diff --git a/sdk/healthinsights/Azure.Health.Insights.ClinicalMatching/src/Generated/Docs/ClinicalMatchingClient.xml b/sdk/healthinsights/Azure.Health.Insights.ClinicalMatching/src/Generated/Docs/ClinicalMatchingClient.xml
index c2588a0df089..b31cef469138 100644
--- a/sdk/healthinsights/Azure.Health.Insights.ClinicalMatching/src/Generated/Docs/ClinicalMatchingClient.xml
+++ b/sdk/healthinsights/Azure.Health.Insights.ClinicalMatching/src/Generated/Docs/ClinicalMatchingClient.xml
@@ -2,332 +2,360 @@
 <doc>
   <members>
     <member name="MatchTrialsAsync(WaitUntil,TrialMatcherData,CancellationToken)">
-<example>
-This sample shows how to call MatchTrialsAsync with required parameters.
+      <example>
+This sample shows how to call MatchTrialsAsync.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ClinicalMatchingClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
 
-var trialMatcherData = new TrialMatcherData(new PatientRecord[] 
+TrialMatcherData trialMatcherData = new TrialMatcherData(new List<PatientRecord>()
 {
-    new PatientRecord("<id>")
+new PatientRecord("<id>")
+});
+Operation<TrialMatcherResult> operation = await client.MatchTrialsAsync(WaitUntil.Completed, trialMatcherData);
+TrialMatcherResult responseData = operation.Value;
+]]></code>
+This sample shows how to call MatchTrialsAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
+
+TrialMatcherData trialMatcherData = new TrialMatcherData(new List<PatientRecord>()
 {
-        Info = new PatientInfo()
+new PatientRecord("<id>")
 {
-            Sex = PatientInfoSex.Female,
-            BirthDate = DateTimeOffset.UtcNow,
-            ClinicalInfo = 
+Info = new PatientInfo()
 {
-                new ClinicalCodedElement("<system>", "<code>")
+Sex = PatientInfoSex.Female,
+BirthDate = DateTimeOffset.Parse("2022-05-10"),
+ClinicalInfo =
 {
-                    Name = "<Name>",
-                    Value = "<Value>",
-                }
-            },
-        },
-        Data = 
+new ClinicalCodedElement("<system>","<code>")
 {
-            new PatientDocument(DocumentType.Note, "<id>", new DocumentContent(DocumentContentSourceType.Inline, "<value>"))
+Name = "<name>",
+Value = "<value>",
+}
+},
+},
+Data =
 {
-                ClinicalType = ClinicalDocumentType.Consultation,
-                Language = "<Language>",
-                CreatedDateTime = DateTimeOffset.UtcNow,
-            }
-        },
-    }
+new PatientDocument(DocumentType.Note,"<id>",new DocumentContent(DocumentContentSourceType.Inline,"<value>"))
+{
+ClinicalType = ClinicalDocumentType.Consultation,
+Language = "<language>",
+CreatedDateTime = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
+},
+}
 })
 {
     Configuration = new TrialMatcherModelConfiguration(new ClinicalTrials()
+    {
+        CustomTrials =
 {
-        CustomTrials = 
-{
-            new ClinicalTrialDetails("<id>", new ClinicalTrialMetadata(new string[] 
+new ClinicalTrialDetails("<id>",new ClinicalTrialMetadata(new List<string>()
 {
-                "<null>"
-            })
+"<conditions>"
+})
 {
-                Phases = 
+Phases =
 {
-                    ClinicalTrialPhase.NotApplicable
-                },
-                StudyType = ClinicalTrialStudyType.Interventional,
-                RecruitmentStatus = ClinicalTrialRecruitmentStatus.UnknownStatus,
-                Sponsors = 
+ClinicalTrialPhase.NotApplicable
+},
+StudyType = ClinicalTrialStudyType.Interventional,
+RecruitmentStatus = ClinicalTrialRecruitmentStatus.UnknownStatus,
+Sponsors =
 {
-                    "<null>"
-                },
-                Contacts = 
+"<sponsors>"
+},
+Contacts =
 {
-                    new ContactDetails()
+new ContactDetails()
 {
-                        Name = "<Name>",
-                        Email = "<Email>",
-                        Phone = "<Phone>",
-                    }
-                },
-                Facilities = 
+Name = "<name>",
+Email = "<email>",
+Phone = "<phone>",
+}
+},
+Facilities =
 {
-                    new ClinicalTrialResearchFacility("<name>", "<countryOrRegion>")
+new ClinicalTrialResearchFacility("<name>","<countryOrRegion>")
 {
-                        City = "<City>",
-                        State = "<State>",
-                    }
-                },
-            })
+City = "<city>",
+State = "<state>",
+}
+},
+})
 {
-                EligibilityCriteriaText = "<EligibilityCriteriaText>",
-                Demographics = new ClinicalTrialDemographics()
+EligibilityCriteriaText = "<eligibilityCriteriaText>",
+Demographics = new ClinicalTrialDemographics()
 {
-                    AcceptedSex = ClinicalTrialAcceptedSex.All,
-                    AcceptedAgeRange = new AcceptedAgeRange()
+AcceptedSex = ClinicalTrialAcceptedSex.All,
+AcceptedAgeRange = new AcceptedAgeRange()
 {
-                        MinimumAge = new AcceptedAge(AgeUnit.Years, 3.14f),
-                        MaximumAge = new AcceptedAge(AgeUnit.Years, 3.14f),
-                    },
-                },
-            }
-        },
-        RegistryFilters = 
+MinimumAge = new AcceptedAge(AgeUnit.Years,123.45F),
+MaximumAge = null,
+},
+},
+}
+},
+        RegistryFilters =
 {
-            new ClinicalTrialRegistryFilter()
+new ClinicalTrialRegistryFilter()
 {
-                Conditions = 
+Conditions =
 {
-                    "<null>"
-                },
-                StudyTypes = 
+"<conditions>"
+},
+StudyTypes =
 {
-                    ClinicalTrialStudyType.Interventional
-                },
-                RecruitmentStatuses = 
+ClinicalTrialStudyType.Interventional
+},
+RecruitmentStatuses =
 {
-                    ClinicalTrialRecruitmentStatus.UnknownStatus
-                },
-                Sponsors = 
+ClinicalTrialRecruitmentStatus.UnknownStatus
+},
+Sponsors =
 {
-                    "<null>"
-                },
-                Phases = 
+"<sponsors>"
+},
+Phases =
 {
-                    ClinicalTrialPhase.NotApplicable
-                },
-                Purposes = 
+ClinicalTrialPhase.NotApplicable
+},
+Purposes =
 {
-                    ClinicalTrialPurpose.NotApplicable
-                },
-                Ids = 
+ClinicalTrialPurpose.NotApplicable
+},
+Ids =
 {
-                    "<null>"
-                },
-                Sources = 
+"<ids>"
+},
+Sources =
 {
-                    ClinicalTrialSource.Custom
-                },
-                FacilityNames = 
+ClinicalTrialSource.Custom
+},
+FacilityNames =
 {
-                    "<null>"
-                },
-                FacilityLocations = 
+"<facilityNames>"
+},
+FacilityLocations =
 {
-                    new GeographicLocation("<countryOrRegion>")
+new GeographicLocation("<countryOrRegion>")
 {
-                        City = "<City>",
-                        State = "<State>",
-                    }
-                },
-                FacilityAreas = 
+City = "<city>",
+State = "<state>",
+}
+},
+FacilityAreas =
 {
-                    new GeographicArea(GeoJsonType.Feature, new AreaGeometry(GeoJsonGeometryType.Point, new float[] 
+new GeographicArea(GeoJsonType.Feature,new AreaGeometry(GeoJsonGeometryType.Point,new List<float>()
 {
-                        3.14f
-                    }), new AreaProperties(GeoJsonPropertiesSubType.Circle, 3.14))
-                },
-            }
-        },
+123.45F
+}),new AreaProperties(GeoJsonPropertiesSubType.Circle,123.45))
+},
+}
+},
     })
-{
+    {
         Verbose = true,
         IncludeEvidence = true,
     },
 };
-var operation = await client.MatchTrialsAsync(WaitUntil.Completed, trialMatcherData);
-]]></code>
-</example>
+Operation<TrialMatcherResult> operation = await client.MatchTrialsAsync(WaitUntil.Completed, trialMatcherData);
+TrialMatcherResult responseData = operation.Value;
+]]></code></example>
     </member>
     <member name="MatchTrials(WaitUntil,TrialMatcherData,CancellationToken)">
-<example>
-This sample shows how to call MatchTrials with required parameters.
+      <example>
+This sample shows how to call MatchTrials.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ClinicalMatchingClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
 
-var trialMatcherData = new TrialMatcherData(new PatientRecord[] 
+TrialMatcherData trialMatcherData = new TrialMatcherData(new List<PatientRecord>()
 {
-    new PatientRecord("<id>")
+new PatientRecord("<id>")
+});
+Operation<TrialMatcherResult> operation = client.MatchTrials(WaitUntil.Completed, trialMatcherData);
+TrialMatcherResult responseData = operation.Value;
+]]></code>
+This sample shows how to call MatchTrials with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
+
+TrialMatcherData trialMatcherData = new TrialMatcherData(new List<PatientRecord>()
 {
-        Info = new PatientInfo()
+new PatientRecord("<id>")
 {
-            Sex = PatientInfoSex.Female,
-            BirthDate = DateTimeOffset.UtcNow,
-            ClinicalInfo = 
+Info = new PatientInfo()
 {
-                new ClinicalCodedElement("<system>", "<code>")
+Sex = PatientInfoSex.Female,
+BirthDate = DateTimeOffset.Parse("2022-05-10"),
+ClinicalInfo =
 {
-                    Name = "<Name>",
-                    Value = "<Value>",
-                }
-            },
-        },
-        Data = 
+new ClinicalCodedElement("<system>","<code>")
 {
-            new PatientDocument(DocumentType.Note, "<id>", new DocumentContent(DocumentContentSourceType.Inline, "<value>"))
+Name = "<name>",
+Value = "<value>",
+}
+},
+},
+Data =
 {
-                ClinicalType = ClinicalDocumentType.Consultation,
-                Language = "<Language>",
-                CreatedDateTime = DateTimeOffset.UtcNow,
-            }
-        },
-    }
+new PatientDocument(DocumentType.Note,"<id>",new DocumentContent(DocumentContentSourceType.Inline,"<value>"))
+{
+ClinicalType = ClinicalDocumentType.Consultation,
+Language = "<language>",
+CreatedDateTime = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
+},
+}
 })
 {
     Configuration = new TrialMatcherModelConfiguration(new ClinicalTrials()
+    {
+        CustomTrials =
 {
-        CustomTrials = 
-{
-            new ClinicalTrialDetails("<id>", new ClinicalTrialMetadata(new string[] 
+new ClinicalTrialDetails("<id>",new ClinicalTrialMetadata(new List<string>()
 {
-                "<null>"
-            })
+"<conditions>"
+})
 {
-                Phases = 
+Phases =
 {
-                    ClinicalTrialPhase.NotApplicable
-                },
-                StudyType = ClinicalTrialStudyType.Interventional,
-                RecruitmentStatus = ClinicalTrialRecruitmentStatus.UnknownStatus,
-                Sponsors = 
+ClinicalTrialPhase.NotApplicable
+},
+StudyType = ClinicalTrialStudyType.Interventional,
+RecruitmentStatus = ClinicalTrialRecruitmentStatus.UnknownStatus,
+Sponsors =
 {
-                    "<null>"
-                },
-                Contacts = 
+"<sponsors>"
+},
+Contacts =
 {
-                    new ContactDetails()
+new ContactDetails()
 {
-                        Name = "<Name>",
-                        Email = "<Email>",
-                        Phone = "<Phone>",
-                    }
-                },
-                Facilities = 
+Name = "<name>",
+Email = "<email>",
+Phone = "<phone>",
+}
+},
+Facilities =
 {
-                    new ClinicalTrialResearchFacility("<name>", "<countryOrRegion>")
+new ClinicalTrialResearchFacility("<name>","<countryOrRegion>")
 {
-                        City = "<City>",
-                        State = "<State>",
-                    }
-                },
-            })
+City = "<city>",
+State = "<state>",
+}
+},
+})
 {
-                EligibilityCriteriaText = "<EligibilityCriteriaText>",
-                Demographics = new ClinicalTrialDemographics()
+EligibilityCriteriaText = "<eligibilityCriteriaText>",
+Demographics = new ClinicalTrialDemographics()
 {
-                    AcceptedSex = ClinicalTrialAcceptedSex.All,
-                    AcceptedAgeRange = new AcceptedAgeRange()
+AcceptedSex = ClinicalTrialAcceptedSex.All,
+AcceptedAgeRange = new AcceptedAgeRange()
 {
-                        MinimumAge = new AcceptedAge(AgeUnit.Years, 3.14f),
-                        MaximumAge = new AcceptedAge(AgeUnit.Years, 3.14f),
-                    },
-                },
-            }
-        },
-        RegistryFilters = 
+MinimumAge = new AcceptedAge(AgeUnit.Years,123.45F),
+MaximumAge = null,
+},
+},
+}
+},
+        RegistryFilters =
 {
-            new ClinicalTrialRegistryFilter()
+new ClinicalTrialRegistryFilter()
 {
-                Conditions = 
+Conditions =
 {
-                    "<null>"
-                },
-                StudyTypes = 
+"<conditions>"
+},
+StudyTypes =
 {
-                    ClinicalTrialStudyType.Interventional
-                },
-                RecruitmentStatuses = 
+ClinicalTrialStudyType.Interventional
+},
+RecruitmentStatuses =
 {
-                    ClinicalTrialRecruitmentStatus.UnknownStatus
-                },
-                Sponsors = 
+ClinicalTrialRecruitmentStatus.UnknownStatus
+},
+Sponsors =
 {
-                    "<null>"
-                },
-                Phases = 
+"<sponsors>"
+},
+Phases =
 {
-                    ClinicalTrialPhase.NotApplicable
-                },
-                Purposes = 
+ClinicalTrialPhase.NotApplicable
+},
+Purposes =
 {
-                    ClinicalTrialPurpose.NotApplicable
-                },
-                Ids = 
+ClinicalTrialPurpose.NotApplicable
+},
+Ids =
 {
-                    "<null>"
-                },
-                Sources = 
+"<ids>"
+},
+Sources =
 {
-                    ClinicalTrialSource.Custom
-                },
-                FacilityNames = 
+ClinicalTrialSource.Custom
+},
+FacilityNames =
 {
-                    "<null>"
-                },
-                FacilityLocations = 
+"<facilityNames>"
+},
+FacilityLocations =
 {
-                    new GeographicLocation("<countryOrRegion>")
+new GeographicLocation("<countryOrRegion>")
 {
-                        City = "<City>",
-                        State = "<State>",
-                    }
-                },
-                FacilityAreas = 
+City = "<city>",
+State = "<state>",
+}
+},
+FacilityAreas =
 {
-                    new GeographicArea(GeoJsonType.Feature, new AreaGeometry(GeoJsonGeometryType.Point, new float[] 
+new GeographicArea(GeoJsonType.Feature,new AreaGeometry(GeoJsonGeometryType.Point,new List<float>()
 {
-                        3.14f
-                    }), new AreaProperties(GeoJsonPropertiesSubType.Circle, 3.14))
-                },
-            }
-        },
+123.45F
+}),new AreaProperties(GeoJsonPropertiesSubType.Circle,123.45))
+},
+}
+},
     })
-{
+    {
         Verbose = true,
         IncludeEvidence = true,
     },
 };
-var operation = client.MatchTrials(WaitUntil.Completed, trialMatcherData);
-]]></code>
-</example>
+Operation<TrialMatcherResult> operation = client.MatchTrials(WaitUntil.Completed, trialMatcherData);
+TrialMatcherResult responseData = operation.Value;
+]]></code></example>
     </member>
     <member name="MatchTrialsAsync(WaitUntil,RequestContent,RequestContext)">
-<example>
-This sample shows how to call MatchTrialsAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call MatchTrialsAsync and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ClinicalMatchingClient(endpoint, credential);
-
-var data = new {
-    patients = new[] {
-        new {
-            id = "<id>",
-        }
-    },
-};
-
-var operation = await client.MatchTrialsAsync(WaitUntil.Completed, RequestContent.Create(data));
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+}
+},
+});
+Operation<BinaryData> operation = await client.MatchTrialsAsync(WaitUntil.Completed, content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -335,154 +363,193 @@ Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastUpdateDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call MatchTrialsAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call MatchTrialsAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ClinicalMatchingClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
 
-var data = new {
-    patients = new[] {
-        new {
-            id = "<id>",
-            info = new {
-                sex = "female",
-                birthDate = "2022-05-10",
-                clinicalInfo = new[] {
-                    new {
-                        system = "<system>",
-                        code = "<code>",
-                        name = "<name>",
-                        value = "<value>",
-                    }
-                },
-            },
-            data = new[] {
-                new {
-                    type = "note",
-                    clinicalType = "consultation",
-                    id = "<id>",
-                    language = "<language>",
-                    createdDateTime = "2022-05-10T14:57:31.2311892-04:00",
-                    content = new {
-                        sourceType = "inline",
-                        value = "<value>",
-                    },
-                }
-            },
-        }
-    },
-    configuration = new {
-        verbose = true,
-        includeEvidence = true,
-        clinicalTrials = new {
-            customTrials = new[] {
-                new {
-                    id = "<id>",
-                    eligibilityCriteriaText = "<eligibilityCriteriaText>",
-                    demographics = new {
-                        acceptedSex = "all",
-                        acceptedAgeRange = new {
-                            minimumAge = new {
-                                unit = "years",
-                                value = 123.45f,
-                            },
-                            maximumAge = new {
-                                unit = "years",
-                                value = 123.45f,
-                            },
-                        },
-                    },
-                    metadata = new {
-                        phases = new[] {
-                            "notApplicable"
-                        },
-                        studyType = "interventional",
-                        recruitmentStatus = "unknownStatus",
-                        conditions = new[] {
-                            "<String>"
-                        },
-                        sponsors = new[] {
-                            "<String>"
-                        },
-                        contacts = new[] {
-                            new {
-                                name = "<name>",
-                                email = "<email>",
-                                phone = "<phone>",
-                            }
-                        },
-                        facilities = new[] {
-                            new {
-                                name = "<name>",
-                                city = "<city>",
-                                state = "<state>",
-                                countryOrRegion = "<countryOrRegion>",
-                            }
-                        },
-                    },
-                }
-            },
-            registryFilters = new[] {
-                new {
-                    conditions = new[] {
-                        "<String>"
-                    },
-                    studyTypes = new[] {
-                        "interventional"
-                    },
-                    recruitmentStatuses = new[] {
-                        "unknownStatus"
-                    },
-                    sponsors = new[] {
-                        "<String>"
-                    },
-                    phases = new[] {
-                        "notApplicable"
-                    },
-                    purposes = new[] {
-                        "notApplicable"
-                    },
-                    ids = new[] {
-                        "<String>"
-                    },
-                    sources = new[] {
-                        "custom"
-                    },
-                    facilityNames = new[] {
-                        "<String>"
-                    },
-                    facilityLocations = new[] {
-                        new {
-                            city = "<city>",
-                            state = "<state>",
-                            countryOrRegion = "<countryOrRegion>",
-                        }
-                    },
-                    facilityAreas = new[] {
-                        new {
-                            type = "Feature",
-                            geometry = new {
-                                type = "Point",
-                                coordinates = new[] {
-                                    123.45f
-                                },
-                            },
-                            properties = new {
-                                subType = "Circle",
-                                radius = 123.45d,
-                            },
-                        }
-                    },
-                }
-            },
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = new Dictionary<string, object>()
+{
+["sex"] = "female",
+["birthDate"] = "2022-05-10",
+["clinicalInfo"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["system"] = "<system>",
+["code"] = "<code>",
+["name"] = "<name>",
+["value"] = "<value>",
+}
+},
+},
+["data"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "note",
+["clinicalType"] = "consultation",
+["id"] = "<id>",
+["language"] = "<language>",
+["createdDateTime"] = "2022-05-10T14:57:31.2311892-04:00",
+["content"] = new Dictionary<string, object>()
+{
+["sourceType"] = "inline",
+["value"] = "<value>",
+},
+}
+},
+}
+},
+    ["configuration"] = new Dictionary<string, object>()
+    {
+        ["verbose"] = true,
+        ["includeEvidence"] = true,
+        ["clinicalTrials"] = new Dictionary<string, object>()
+        {
+            ["customTrials"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["eligibilityCriteriaText"] = "<eligibilityCriteriaText>",
+["demographics"] = new Dictionary<string, object>()
+{
+["acceptedSex"] = "all",
+["acceptedAgeRange"] = new Dictionary<string, object>()
+{
+["minimumAge"] = new Dictionary<string, object>()
+{
+["unit"] = "years",
+["value"] = 123.45F,
+},
+["maximumAge"] = null
+,
+},
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["phases"] = new List<object>()
+{
+"notApplicable"
+},
+["studyType"] = "interventional",
+["recruitmentStatus"] = "unknownStatus",
+["conditions"] = new List<object>()
+{
+"<conditions>"
+},
+["sponsors"] = new List<object>()
+{
+"<sponsors>"
+},
+["contacts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["email"] = "<email>",
+["phone"] = "<phone>",
+}
+},
+["facilities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["city"] = "<city>",
+["state"] = "<state>",
+["countryOrRegion"] = "<countryOrRegion>",
+}
+},
+},
+}
+},
+            ["registryFilters"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["conditions"] = new List<object>()
+{
+"<conditions>"
+},
+["studyTypes"] = new List<object>()
+{
+"interventional"
+},
+["recruitmentStatuses"] = new List<object>()
+{
+"unknownStatus"
+},
+["sponsors"] = new List<object>()
+{
+"<sponsors>"
+},
+["phases"] = new List<object>()
+{
+"notApplicable"
+},
+["purposes"] = new List<object>()
+{
+"notApplicable"
+},
+["ids"] = new List<object>()
+{
+"<ids>"
+},
+["sources"] = new List<object>()
+{
+"custom"
+},
+["facilityNames"] = new List<object>()
+{
+"<facilityNames>"
+},
+["facilityLocations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["city"] = "<city>",
+["state"] = "<state>",
+["countryOrRegion"] = "<countryOrRegion>",
+}
+},
+["facilityAreas"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "Feature",
+["geometry"] = new Dictionary<string, object>()
+{
+["type"] = "Point",
+["coordinates"] = new List<object>()
+{
+123.45F
+},
+},
+["properties"] = new Dictionary<string, object>()
+{
+["subType"] = "Circle",
+["radius"] = 123.45,
+},
+}
+},
+}
+},
         },
     },
-};
-
-var operation = await client.MatchTrialsAsync(WaitUntil.Completed, RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = await client.MatchTrialsAsync(WaitUntil.Completed, content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -530,28 +597,29 @@ Console.WriteLine(result.GetProperty("results").GetProperty("patients")[0].GetPr
 Console.WriteLine(result.GetProperty("results").GetProperty("patients")[0].GetProperty("neededClinicalInfo")[0].GetProperty("category").ToString());
 Console.WriteLine(result.GetProperty("results").GetProperty("modelVersion").ToString());
 Console.WriteLine(result.GetProperty("results").GetProperty("knowledgeGraphLastUpdateDate").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="MatchTrials(WaitUntil,RequestContent,RequestContext)">
-<example>
-This sample shows how to call MatchTrials with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call MatchTrials and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ClinicalMatchingClient(endpoint, credential);
-
-var data = new {
-    patients = new[] {
-        new {
-            id = "<id>",
-        }
-    },
-};
-
-var operation = client.MatchTrials(WaitUntil.Completed, RequestContent.Create(data));
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+}
+},
+});
+Operation<BinaryData> operation = client.MatchTrials(WaitUntil.Completed, content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -559,154 +627,193 @@ Console.WriteLine(result.GetProperty("expirationDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastUpdateDateTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call MatchTrials with all parameters and request content, and how to parse the result.
+This sample shows how to call MatchTrials with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new AzureKeyCredential("<key>");
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ClinicalMatchingClient(endpoint, credential);
+Uri endpoint = new Uri("<https://my-service.azure.com>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
 
-var data = new {
-    patients = new[] {
-        new {
-            id = "<id>",
-            info = new {
-                sex = "female",
-                birthDate = "2022-05-10",
-                clinicalInfo = new[] {
-                    new {
-                        system = "<system>",
-                        code = "<code>",
-                        name = "<name>",
-                        value = "<value>",
-                    }
-                },
-            },
-            data = new[] {
-                new {
-                    type = "note",
-                    clinicalType = "consultation",
-                    id = "<id>",
-                    language = "<language>",
-                    createdDateTime = "2022-05-10T14:57:31.2311892-04:00",
-                    content = new {
-                        sourceType = "inline",
-                        value = "<value>",
-                    },
-                }
-            },
-        }
-    },
-    configuration = new {
-        verbose = true,
-        includeEvidence = true,
-        clinicalTrials = new {
-            customTrials = new[] {
-                new {
-                    id = "<id>",
-                    eligibilityCriteriaText = "<eligibilityCriteriaText>",
-                    demographics = new {
-                        acceptedSex = "all",
-                        acceptedAgeRange = new {
-                            minimumAge = new {
-                                unit = "years",
-                                value = 123.45f,
-                            },
-                            maximumAge = new {
-                                unit = "years",
-                                value = 123.45f,
-                            },
-                        },
-                    },
-                    metadata = new {
-                        phases = new[] {
-                            "notApplicable"
-                        },
-                        studyType = "interventional",
-                        recruitmentStatus = "unknownStatus",
-                        conditions = new[] {
-                            "<String>"
-                        },
-                        sponsors = new[] {
-                            "<String>"
-                        },
-                        contacts = new[] {
-                            new {
-                                name = "<name>",
-                                email = "<email>",
-                                phone = "<phone>",
-                            }
-                        },
-                        facilities = new[] {
-                            new {
-                                name = "<name>",
-                                city = "<city>",
-                                state = "<state>",
-                                countryOrRegion = "<countryOrRegion>",
-                            }
-                        },
-                    },
-                }
-            },
-            registryFilters = new[] {
-                new {
-                    conditions = new[] {
-                        "<String>"
-                    },
-                    studyTypes = new[] {
-                        "interventional"
-                    },
-                    recruitmentStatuses = new[] {
-                        "unknownStatus"
-                    },
-                    sponsors = new[] {
-                        "<String>"
-                    },
-                    phases = new[] {
-                        "notApplicable"
-                    },
-                    purposes = new[] {
-                        "notApplicable"
-                    },
-                    ids = new[] {
-                        "<String>"
-                    },
-                    sources = new[] {
-                        "custom"
-                    },
-                    facilityNames = new[] {
-                        "<String>"
-                    },
-                    facilityLocations = new[] {
-                        new {
-                            city = "<city>",
-                            state = "<state>",
-                            countryOrRegion = "<countryOrRegion>",
-                        }
-                    },
-                    facilityAreas = new[] {
-                        new {
-                            type = "Feature",
-                            geometry = new {
-                                type = "Point",
-                                coordinates = new[] {
-                                    123.45f
-                                },
-                            },
-                            properties = new {
-                                subType = "Circle",
-                                radius = 123.45d,
-                            },
-                        }
-                    },
-                }
-            },
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = new Dictionary<string, object>()
+{
+["sex"] = "female",
+["birthDate"] = "2022-05-10",
+["clinicalInfo"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["system"] = "<system>",
+["code"] = "<code>",
+["name"] = "<name>",
+["value"] = "<value>",
+}
+},
+},
+["data"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "note",
+["clinicalType"] = "consultation",
+["id"] = "<id>",
+["language"] = "<language>",
+["createdDateTime"] = "2022-05-10T14:57:31.2311892-04:00",
+["content"] = new Dictionary<string, object>()
+{
+["sourceType"] = "inline",
+["value"] = "<value>",
+},
+}
+},
+}
+},
+    ["configuration"] = new Dictionary<string, object>()
+    {
+        ["verbose"] = true,
+        ["includeEvidence"] = true,
+        ["clinicalTrials"] = new Dictionary<string, object>()
+        {
+            ["customTrials"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["eligibilityCriteriaText"] = "<eligibilityCriteriaText>",
+["demographics"] = new Dictionary<string, object>()
+{
+["acceptedSex"] = "all",
+["acceptedAgeRange"] = new Dictionary<string, object>()
+{
+["minimumAge"] = new Dictionary<string, object>()
+{
+["unit"] = "years",
+["value"] = 123.45F,
+},
+["maximumAge"] = null
+,
+},
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["phases"] = new List<object>()
+{
+"notApplicable"
+},
+["studyType"] = "interventional",
+["recruitmentStatus"] = "unknownStatus",
+["conditions"] = new List<object>()
+{
+"<conditions>"
+},
+["sponsors"] = new List<object>()
+{
+"<sponsors>"
+},
+["contacts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["email"] = "<email>",
+["phone"] = "<phone>",
+}
+},
+["facilities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["city"] = "<city>",
+["state"] = "<state>",
+["countryOrRegion"] = "<countryOrRegion>",
+}
+},
+},
+}
+},
+            ["registryFilters"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["conditions"] = new List<object>()
+{
+"<conditions>"
+},
+["studyTypes"] = new List<object>()
+{
+"interventional"
+},
+["recruitmentStatuses"] = new List<object>()
+{
+"unknownStatus"
+},
+["sponsors"] = new List<object>()
+{
+"<sponsors>"
+},
+["phases"] = new List<object>()
+{
+"notApplicable"
+},
+["purposes"] = new List<object>()
+{
+"notApplicable"
+},
+["ids"] = new List<object>()
+{
+"<ids>"
+},
+["sources"] = new List<object>()
+{
+"custom"
+},
+["facilityNames"] = new List<object>()
+{
+"<facilityNames>"
+},
+["facilityLocations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["city"] = "<city>",
+["state"] = "<state>",
+["countryOrRegion"] = "<countryOrRegion>",
+}
+},
+["facilityAreas"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "Feature",
+["geometry"] = new Dictionary<string, object>()
+{
+["type"] = "Point",
+["coordinates"] = new List<object>()
+{
+123.45F
+},
+},
+["properties"] = new Dictionary<string, object>()
+{
+["subType"] = "Circle",
+["radius"] = 123.45,
+},
+}
+},
+}
+},
         },
     },
-};
-
-var operation = client.MatchTrials(WaitUntil.Completed, RequestContent.Create(data));
-
+});
+Operation<BinaryData> operation = client.MatchTrials(WaitUntil.Completed, content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("jobId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -754,8 +861,7 @@ Console.WriteLine(result.GetProperty("results").GetProperty("patients")[0].GetPr
 Console.WriteLine(result.GetProperty("results").GetProperty("patients")[0].GetProperty("neededClinicalInfo")[0].GetProperty("category").ToString());
 Console.WriteLine(result.GetProperty("results").GetProperty("modelVersion").ToString());
 Console.WriteLine(result.GetProperty("results").GetProperty("knowledgeGraphLastUpdateDate").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/healthinsights/Azure.Health.Insights.ClinicalMatching/tests/Generated/Samples/Samples_ClinicalMatchingClient.cs b/sdk/healthinsights/Azure.Health.Insights.ClinicalMatching/tests/Generated/Samples/Samples_ClinicalMatchingClient.cs
index 69b3ff71b768..43ad2d998700 100644
--- a/sdk/healthinsights/Azure.Health.Insights.ClinicalMatching/tests/Generated/Samples/Samples_ClinicalMatchingClient.cs
+++ b/sdk/healthinsights/Azure.Health.Insights.ClinicalMatching/tests/Generated/Samples/Samples_ClinicalMatchingClient.cs
@@ -7,11 +7,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
+using Azure.Health.Insights.ClinicalMatching;
 using Azure.Identity;
 using NUnit.Framework;
 
@@ -23,22 +23,23 @@ public class Samples_ClinicalMatchingClient
         [Ignore("Only validating compilation of examples")]
         public void Example_MatchTrials()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ClinicalMatchingClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                patients = new[] {
-        new {
-            id = "<id>",
-        }
-    },
-            };
-
-            var operation = client.MatchTrials(WaitUntil.Completed, RequestContent.Create(data));
-
+                ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+}
+},
+            });
+            Operation<BinaryData> operation = client.MatchTrials(WaitUntil.Completed, content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -51,155 +52,191 @@ public void Example_MatchTrials()
         [Ignore("Only validating compilation of examples")]
         public void Example_MatchTrials_AllParameters()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ClinicalMatchingClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                patients = new[] {
-        new {
-            id = "<id>",
-            info = new {
-                sex = "female",
-                birthDate = "2022-05-10",
-                clinicalInfo = new[] {
-                    new {
-                        system = "<system>",
-                        code = "<code>",
-                        name = "<name>",
-                        value = "<value>",
-                    }
-                },
-            },
-            data = new[] {
-                new {
-                    type = "note",
-                    clinicalType = "consultation",
-                    id = "<id>",
-                    language = "<language>",
-                    createdDateTime = "2022-05-10T14:57:31.2311892-04:00",
-                    content = new {
-                        sourceType = "inline",
-                        value = "<value>",
-                    },
-                }
-            },
-        }
-    },
-                configuration = new
+                ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = new Dictionary<string, object>()
+{
+["sex"] = "female",
+["birthDate"] = "2022-05-10",
+["clinicalInfo"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["system"] = "<system>",
+["code"] = "<code>",
+["name"] = "<name>",
+["value"] = "<value>",
+}
+},
+},
+["data"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "note",
+["clinicalType"] = "consultation",
+["id"] = "<id>",
+["language"] = "<language>",
+["createdDateTime"] = "2022-05-10T14:57:31.2311892-04:00",
+["content"] = new Dictionary<string, object>()
+{
+["sourceType"] = "inline",
+["value"] = "<value>",
+},
+}
+},
+}
+},
+                ["configuration"] = new Dictionary<string, object>()
                 {
-                    verbose = true,
-                    includeEvidence = true,
-                    clinicalTrials = new
+                    ["verbose"] = true,
+                    ["includeEvidence"] = true,
+                    ["clinicalTrials"] = new Dictionary<string, object>()
                     {
-                        customTrials = new[] {
-                new {
-                    id = "<id>",
-                    eligibilityCriteriaText = "<eligibilityCriteriaText>",
-                    demographics = new {
-                        acceptedSex = "all",
-                        acceptedAgeRange = new {
-                            minimumAge = new {
-                                unit = "years",
-                                value = 123.45f,
-                            },
-                            maximumAge = new {
-                                unit = "years",
-                                value = 123.45f,
-                            },
-                        },
-                    },
-                    metadata = new {
-                        phases = new[] {
-                            "notApplicable"
-                        },
-                        studyType = "interventional",
-                        recruitmentStatus = "unknownStatus",
-                        conditions = new[] {
-                            "<String>"
-                        },
-                        sponsors = new[] {
-                            "<String>"
-                        },
-                        contacts = new[] {
-                            new {
-                                name = "<name>",
-                                email = "<email>",
-                                phone = "<phone>",
-                            }
-                        },
-                        facilities = new[] {
-                            new {
-                                name = "<name>",
-                                city = "<city>",
-                                state = "<state>",
-                                countryOrRegion = "<countryOrRegion>",
-                            }
-                        },
-                    },
-                }
-            },
-                        registryFilters = new[] {
-                new {
-                    conditions = new[] {
-                        "<String>"
-                    },
-                    studyTypes = new[] {
-                        "interventional"
-                    },
-                    recruitmentStatuses = new[] {
-                        "unknownStatus"
-                    },
-                    sponsors = new[] {
-                        "<String>"
-                    },
-                    phases = new[] {
-                        "notApplicable"
-                    },
-                    purposes = new[] {
-                        "notApplicable"
-                    },
-                    ids = new[] {
-                        "<String>"
-                    },
-                    sources = new[] {
-                        "custom"
-                    },
-                    facilityNames = new[] {
-                        "<String>"
-                    },
-                    facilityLocations = new[] {
-                        new {
-                            city = "<city>",
-                            state = "<state>",
-                            countryOrRegion = "<countryOrRegion>",
-                        }
-                    },
-                    facilityAreas = new[] {
-                        new {
-                            type = "Feature",
-                            geometry = new {
-                                type = "Point",
-                                coordinates = new[] {
-                                    123.45f
-                                },
-                            },
-                            properties = new {
-                                subType = "Circle",
-                                radius = 123.45d,
-                            },
-                        }
-                    },
-                }
-            },
+                        ["customTrials"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["eligibilityCriteriaText"] = "<eligibilityCriteriaText>",
+["demographics"] = new Dictionary<string, object>()
+{
+["acceptedSex"] = "all",
+["acceptedAgeRange"] = new Dictionary<string, object>()
+{
+["minimumAge"] = new Dictionary<string, object>()
+{
+["unit"] = "years",
+["value"] = 123.45F,
+},
+["maximumAge"] = null
+,
+},
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["phases"] = new List<object>()
+{
+"notApplicable"
+},
+["studyType"] = "interventional",
+["recruitmentStatus"] = "unknownStatus",
+["conditions"] = new List<object>()
+{
+"<conditions>"
+},
+["sponsors"] = new List<object>()
+{
+"<sponsors>"
+},
+["contacts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["email"] = "<email>",
+["phone"] = "<phone>",
+}
+},
+["facilities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["city"] = "<city>",
+["state"] = "<state>",
+["countryOrRegion"] = "<countryOrRegion>",
+}
+},
+},
+}
+},
+                        ["registryFilters"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["conditions"] = new List<object>()
+{
+"<conditions>"
+},
+["studyTypes"] = new List<object>()
+{
+"interventional"
+},
+["recruitmentStatuses"] = new List<object>()
+{
+"unknownStatus"
+},
+["sponsors"] = new List<object>()
+{
+"<sponsors>"
+},
+["phases"] = new List<object>()
+{
+"notApplicable"
+},
+["purposes"] = new List<object>()
+{
+"notApplicable"
+},
+["ids"] = new List<object>()
+{
+"<ids>"
+},
+["sources"] = new List<object>()
+{
+"custom"
+},
+["facilityNames"] = new List<object>()
+{
+"<facilityNames>"
+},
+["facilityLocations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["city"] = "<city>",
+["state"] = "<state>",
+["countryOrRegion"] = "<countryOrRegion>",
+}
+},
+["facilityAreas"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "Feature",
+["geometry"] = new Dictionary<string, object>()
+{
+["type"] = "Point",
+["coordinates"] = new List<object>()
+{
+123.45F
+},
+},
+["properties"] = new Dictionary<string, object>()
+{
+["subType"] = "Circle",
+["radius"] = 123.45,
+},
+}
+},
+}
+},
                     },
                 },
-            };
-
-            var operation = client.MatchTrials(WaitUntil.Completed, RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = client.MatchTrials(WaitUntil.Completed, content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -251,24 +288,195 @@ public void Example_MatchTrials_AllParameters()
 
         [Test]
         [Ignore("Only validating compilation of examples")]
-        public async Task Example_MatchTrials_Async()
+        public void Example_MatchTrials_Convenience()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ClinicalMatchingClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
 
-            var data = new
-            {
-                patients = new[] {
-        new {
-            id = "<id>",
+            TrialMatcherData trialMatcherData = new TrialMatcherData(new List<PatientRecord>()
+{
+new PatientRecord("<id>")
+});
+            Operation<TrialMatcherResult> operation = client.MatchTrials(WaitUntil.Completed, trialMatcherData);
+            TrialMatcherResult responseData = operation.Value;
         }
-    },
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_MatchTrials_AllParameters_Convenience()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
+
+            TrialMatcherData trialMatcherData = new TrialMatcherData(new List<PatientRecord>()
+{
+new PatientRecord("<id>")
+{
+Info = new PatientInfo()
+{
+Sex = PatientInfoSex.Female,
+BirthDate = DateTimeOffset.Parse("2022-05-10"),
+ClinicalInfo =
+{
+new ClinicalCodedElement("<system>","<code>")
+{
+Name = "<name>",
+Value = "<value>",
+}
+},
+},
+Data =
+{
+new PatientDocument(DocumentType.Note,"<id>",new DocumentContent(DocumentContentSourceType.Inline,"<value>"))
+{
+ClinicalType = ClinicalDocumentType.Consultation,
+Language = "<language>",
+CreatedDateTime = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
+},
+}
+})
+            {
+                Configuration = new TrialMatcherModelConfiguration(new ClinicalTrials()
+                {
+                    CustomTrials =
+{
+new ClinicalTrialDetails("<id>",new ClinicalTrialMetadata(new List<string>()
+{
+"<conditions>"
+})
+{
+Phases =
+{
+ClinicalTrialPhase.NotApplicable
+},
+StudyType = ClinicalTrialStudyType.Interventional,
+RecruitmentStatus = ClinicalTrialRecruitmentStatus.UnknownStatus,
+Sponsors =
+{
+"<sponsors>"
+},
+Contacts =
+{
+new ContactDetails()
+{
+Name = "<name>",
+Email = "<email>",
+Phone = "<phone>",
+}
+},
+Facilities =
+{
+new ClinicalTrialResearchFacility("<name>","<countryOrRegion>")
+{
+City = "<city>",
+State = "<state>",
+}
+},
+})
+{
+EligibilityCriteriaText = "<eligibilityCriteriaText>",
+Demographics = new ClinicalTrialDemographics()
+{
+AcceptedSex = ClinicalTrialAcceptedSex.All,
+AcceptedAgeRange = new AcceptedAgeRange()
+{
+MinimumAge = new AcceptedAge(AgeUnit.Years,123.45F),
+MaximumAge = null,
+},
+},
+}
+},
+                    RegistryFilters =
+{
+new ClinicalTrialRegistryFilter()
+{
+Conditions =
+{
+"<conditions>"
+},
+StudyTypes =
+{
+ClinicalTrialStudyType.Interventional
+},
+RecruitmentStatuses =
+{
+ClinicalTrialRecruitmentStatus.UnknownStatus
+},
+Sponsors =
+{
+"<sponsors>"
+},
+Phases =
+{
+ClinicalTrialPhase.NotApplicable
+},
+Purposes =
+{
+ClinicalTrialPurpose.NotApplicable
+},
+Ids =
+{
+"<ids>"
+},
+Sources =
+{
+ClinicalTrialSource.Custom
+},
+FacilityNames =
+{
+"<facilityNames>"
+},
+FacilityLocations =
+{
+new GeographicLocation("<countryOrRegion>")
+{
+City = "<city>",
+State = "<state>",
+}
+},
+FacilityAreas =
+{
+new GeographicArea(GeoJsonType.Feature,new AreaGeometry(GeoJsonGeometryType.Point,new List<float>()
+{
+123.45F
+}),new AreaProperties(GeoJsonPropertiesSubType.Circle,123.45))
+},
+}
+},
+                })
+                {
+                    Verbose = true,
+                    IncludeEvidence = true,
+                },
             };
+            Operation<TrialMatcherResult> operation = client.MatchTrials(WaitUntil.Completed, trialMatcherData);
+            TrialMatcherResult responseData = operation.Value;
+        }
 
-            var operation = await client.MatchTrialsAsync(WaitUntil.Completed, RequestContent.Create(data));
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_MatchTrials_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
 
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+            {
+                ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+}
+},
+            });
+            Operation<BinaryData> operation = await client.MatchTrialsAsync(WaitUntil.Completed, content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -281,155 +489,191 @@ public async Task Example_MatchTrials_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_MatchTrials_AllParameters_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ClinicalMatchingClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                patients = new[] {
-        new {
-            id = "<id>",
-            info = new {
-                sex = "female",
-                birthDate = "2022-05-10",
-                clinicalInfo = new[] {
-                    new {
-                        system = "<system>",
-                        code = "<code>",
-                        name = "<name>",
-                        value = "<value>",
-                    }
-                },
-            },
-            data = new[] {
-                new {
-                    type = "note",
-                    clinicalType = "consultation",
-                    id = "<id>",
-                    language = "<language>",
-                    createdDateTime = "2022-05-10T14:57:31.2311892-04:00",
-                    content = new {
-                        sourceType = "inline",
-                        value = "<value>",
-                    },
-                }
-            },
-        }
-    },
-                configuration = new
+                ["patients"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = new Dictionary<string, object>()
+{
+["sex"] = "female",
+["birthDate"] = "2022-05-10",
+["clinicalInfo"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["system"] = "<system>",
+["code"] = "<code>",
+["name"] = "<name>",
+["value"] = "<value>",
+}
+},
+},
+["data"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "note",
+["clinicalType"] = "consultation",
+["id"] = "<id>",
+["language"] = "<language>",
+["createdDateTime"] = "2022-05-10T14:57:31.2311892-04:00",
+["content"] = new Dictionary<string, object>()
+{
+["sourceType"] = "inline",
+["value"] = "<value>",
+},
+}
+},
+}
+},
+                ["configuration"] = new Dictionary<string, object>()
                 {
-                    verbose = true,
-                    includeEvidence = true,
-                    clinicalTrials = new
+                    ["verbose"] = true,
+                    ["includeEvidence"] = true,
+                    ["clinicalTrials"] = new Dictionary<string, object>()
                     {
-                        customTrials = new[] {
-                new {
-                    id = "<id>",
-                    eligibilityCriteriaText = "<eligibilityCriteriaText>",
-                    demographics = new {
-                        acceptedSex = "all",
-                        acceptedAgeRange = new {
-                            minimumAge = new {
-                                unit = "years",
-                                value = 123.45f,
-                            },
-                            maximumAge = new {
-                                unit = "years",
-                                value = 123.45f,
-                            },
-                        },
-                    },
-                    metadata = new {
-                        phases = new[] {
-                            "notApplicable"
-                        },
-                        studyType = "interventional",
-                        recruitmentStatus = "unknownStatus",
-                        conditions = new[] {
-                            "<String>"
-                        },
-                        sponsors = new[] {
-                            "<String>"
-                        },
-                        contacts = new[] {
-                            new {
-                                name = "<name>",
-                                email = "<email>",
-                                phone = "<phone>",
-                            }
-                        },
-                        facilities = new[] {
-                            new {
-                                name = "<name>",
-                                city = "<city>",
-                                state = "<state>",
-                                countryOrRegion = "<countryOrRegion>",
-                            }
-                        },
-                    },
-                }
-            },
-                        registryFilters = new[] {
-                new {
-                    conditions = new[] {
-                        "<String>"
-                    },
-                    studyTypes = new[] {
-                        "interventional"
-                    },
-                    recruitmentStatuses = new[] {
-                        "unknownStatus"
-                    },
-                    sponsors = new[] {
-                        "<String>"
-                    },
-                    phases = new[] {
-                        "notApplicable"
-                    },
-                    purposes = new[] {
-                        "notApplicable"
-                    },
-                    ids = new[] {
-                        "<String>"
-                    },
-                    sources = new[] {
-                        "custom"
-                    },
-                    facilityNames = new[] {
-                        "<String>"
-                    },
-                    facilityLocations = new[] {
-                        new {
-                            city = "<city>",
-                            state = "<state>",
-                            countryOrRegion = "<countryOrRegion>",
-                        }
-                    },
-                    facilityAreas = new[] {
-                        new {
-                            type = "Feature",
-                            geometry = new {
-                                type = "Point",
-                                coordinates = new[] {
-                                    123.45f
-                                },
-                            },
-                            properties = new {
-                                subType = "Circle",
-                                radius = 123.45d,
-                            },
-                        }
-                    },
-                }
-            },
+                        ["customTrials"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["eligibilityCriteriaText"] = "<eligibilityCriteriaText>",
+["demographics"] = new Dictionary<string, object>()
+{
+["acceptedSex"] = "all",
+["acceptedAgeRange"] = new Dictionary<string, object>()
+{
+["minimumAge"] = new Dictionary<string, object>()
+{
+["unit"] = "years",
+["value"] = 123.45F,
+},
+["maximumAge"] = null
+,
+},
+},
+["metadata"] = new Dictionary<string, object>()
+{
+["phases"] = new List<object>()
+{
+"notApplicable"
+},
+["studyType"] = "interventional",
+["recruitmentStatus"] = "unknownStatus",
+["conditions"] = new List<object>()
+{
+"<conditions>"
+},
+["sponsors"] = new List<object>()
+{
+"<sponsors>"
+},
+["contacts"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["email"] = "<email>",
+["phone"] = "<phone>",
+}
+},
+["facilities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["city"] = "<city>",
+["state"] = "<state>",
+["countryOrRegion"] = "<countryOrRegion>",
+}
+},
+},
+}
+},
+                        ["registryFilters"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["conditions"] = new List<object>()
+{
+"<conditions>"
+},
+["studyTypes"] = new List<object>()
+{
+"interventional"
+},
+["recruitmentStatuses"] = new List<object>()
+{
+"unknownStatus"
+},
+["sponsors"] = new List<object>()
+{
+"<sponsors>"
+},
+["phases"] = new List<object>()
+{
+"notApplicable"
+},
+["purposes"] = new List<object>()
+{
+"notApplicable"
+},
+["ids"] = new List<object>()
+{
+"<ids>"
+},
+["sources"] = new List<object>()
+{
+"custom"
+},
+["facilityNames"] = new List<object>()
+{
+"<facilityNames>"
+},
+["facilityLocations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["city"] = "<city>",
+["state"] = "<state>",
+["countryOrRegion"] = "<countryOrRegion>",
+}
+},
+["facilityAreas"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "Feature",
+["geometry"] = new Dictionary<string, object>()
+{
+["type"] = "Point",
+["coordinates"] = new List<object>()
+{
+123.45F
+},
+},
+["properties"] = new Dictionary<string, object>()
+{
+["subType"] = "Circle",
+["radius"] = 123.45,
+},
+}
+},
+}
+},
                     },
                 },
-            };
-
-            var operation = await client.MatchTrialsAsync(WaitUntil.Completed, RequestContent.Create(data));
-
+            });
+            Operation<BinaryData> operation = await client.MatchTrialsAsync(WaitUntil.Completed, content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("jobId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
@@ -483,153 +727,170 @@ public async Task Example_MatchTrials_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_MatchTrials_Convenience_Async()
         {
-            var credential = new AzureKeyCredential("<key>");
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ClinicalMatchingClient(endpoint, credential);
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
 
-            var trialMatcherData = new TrialMatcherData(new PatientRecord[]
-            {
-    new PatientRecord("<id>")
+            TrialMatcherData trialMatcherData = new TrialMatcherData(new List<PatientRecord>()
+{
+new PatientRecord("<id>")
+});
+            Operation<TrialMatcherResult> operation = await client.MatchTrialsAsync(WaitUntil.Completed, trialMatcherData);
+            TrialMatcherResult responseData = operation.Value;
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_MatchTrials_AllParameters_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<https://my-service.azure.com>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            ClinicalMatchingClient client = new ClinicalMatchingClient(endpoint, credential);
+
+            TrialMatcherData trialMatcherData = new TrialMatcherData(new List<PatientRecord>()
+{
+new PatientRecord("<id>")
 {
-        Info = new PatientInfo()
+Info = new PatientInfo()
 {
-            Sex = PatientInfoSex.Female,
-            BirthDate = DateTimeOffset.UtcNow,
-            ClinicalInfo =
+Sex = PatientInfoSex.Female,
+BirthDate = DateTimeOffset.Parse("2022-05-10"),
+ClinicalInfo =
 {
-                new ClinicalCodedElement("<system>", "<code>")
+new ClinicalCodedElement("<system>","<code>")
 {
-                    Name = "<Name>",
-                    Value = "<Value>",
-                }
-            },
-        },
-        Data =
+Name = "<name>",
+Value = "<value>",
+}
+},
+},
+Data =
 {
-            new PatientDocument(DocumentType.Note, "<id>", new DocumentContent(DocumentContentSourceType.Inline, "<value>"))
+new PatientDocument(DocumentType.Note,"<id>",new DocumentContent(DocumentContentSourceType.Inline,"<value>"))
 {
-                ClinicalType = ClinicalDocumentType.Consultation,
-                Language = "<Language>",
-                CreatedDateTime = DateTimeOffset.UtcNow,
-            }
-        },
-    }
-            })
+ClinicalType = ClinicalDocumentType.Consultation,
+Language = "<language>",
+CreatedDateTime = DateTimeOffset.Parse("2022-05-10T14:57:31.2311892-04:00"),
+}
+},
+}
+})
             {
                 Configuration = new TrialMatcherModelConfiguration(new ClinicalTrials()
                 {
                     CustomTrials =
 {
-            new ClinicalTrialDetails("<id>", new ClinicalTrialMetadata(new string[]
+new ClinicalTrialDetails("<id>",new ClinicalTrialMetadata(new List<string>()
 {
-                "<null>"
-            })
+"<conditions>"
+})
 {
-                Phases =
+Phases =
 {
-                    ClinicalTrialPhase.NotApplicable
-                },
-                StudyType = ClinicalTrialStudyType.Interventional,
-                RecruitmentStatus = ClinicalTrialRecruitmentStatus.UnknownStatus,
-                Sponsors =
+ClinicalTrialPhase.NotApplicable
+},
+StudyType = ClinicalTrialStudyType.Interventional,
+RecruitmentStatus = ClinicalTrialRecruitmentStatus.UnknownStatus,
+Sponsors =
 {
-                    "<null>"
-                },
-                Contacts =
+"<sponsors>"
+},
+Contacts =
 {
-                    new ContactDetails()
+new ContactDetails()
 {
-                        Name = "<Name>",
-                        Email = "<Email>",
-                        Phone = "<Phone>",
-                    }
-                },
-                Facilities =
+Name = "<name>",
+Email = "<email>",
+Phone = "<phone>",
+}
+},
+Facilities =
 {
-                    new ClinicalTrialResearchFacility("<name>", "<countryOrRegion>")
+new ClinicalTrialResearchFacility("<name>","<countryOrRegion>")
 {
-                        City = "<City>",
-                        State = "<State>",
-                    }
-                },
-            })
+City = "<city>",
+State = "<state>",
+}
+},
+})
 {
-                EligibilityCriteriaText = "<EligibilityCriteriaText>",
-                Demographics = new ClinicalTrialDemographics()
+EligibilityCriteriaText = "<eligibilityCriteriaText>",
+Demographics = new ClinicalTrialDemographics()
 {
-                    AcceptedSex = ClinicalTrialAcceptedSex.All,
-                    AcceptedAgeRange = new AcceptedAgeRange()
+AcceptedSex = ClinicalTrialAcceptedSex.All,
+AcceptedAgeRange = new AcceptedAgeRange()
 {
-                        MinimumAge = new AcceptedAge(AgeUnit.Years, 3.14f),
-                        MaximumAge = new AcceptedAge(AgeUnit.Years, 3.14f),
-                    },
-                },
-            }
-        },
+MinimumAge = new AcceptedAge(AgeUnit.Years,123.45F),
+MaximumAge = null,
+},
+},
+}
+},
                     RegistryFilters =
 {
-            new ClinicalTrialRegistryFilter()
+new ClinicalTrialRegistryFilter()
 {
-                Conditions =
+Conditions =
 {
-                    "<null>"
-                },
-                StudyTypes =
+"<conditions>"
+},
+StudyTypes =
 {
-                    ClinicalTrialStudyType.Interventional
-                },
-                RecruitmentStatuses =
+ClinicalTrialStudyType.Interventional
+},
+RecruitmentStatuses =
 {
-                    ClinicalTrialRecruitmentStatus.UnknownStatus
-                },
-                Sponsors =
+ClinicalTrialRecruitmentStatus.UnknownStatus
+},
+Sponsors =
 {
-                    "<null>"
-                },
-                Phases =
+"<sponsors>"
+},
+Phases =
 {
-                    ClinicalTrialPhase.NotApplicable
-                },
-                Purposes =
+ClinicalTrialPhase.NotApplicable
+},
+Purposes =
 {
-                    ClinicalTrialPurpose.NotApplicable
-                },
-                Ids =
+ClinicalTrialPurpose.NotApplicable
+},
+Ids =
 {
-                    "<null>"
-                },
-                Sources =
+"<ids>"
+},
+Sources =
 {
-                    ClinicalTrialSource.Custom
-                },
-                FacilityNames =
+ClinicalTrialSource.Custom
+},
+FacilityNames =
 {
-                    "<null>"
-                },
-                FacilityLocations =
+"<facilityNames>"
+},
+FacilityLocations =
 {
-                    new GeographicLocation("<countryOrRegion>")
+new GeographicLocation("<countryOrRegion>")
 {
-                        City = "<City>",
-                        State = "<State>",
-                    }
-                },
-                FacilityAreas =
+City = "<city>",
+State = "<state>",
+}
+},
+FacilityAreas =
 {
-                    new GeographicArea(GeoJsonType.Feature, new AreaGeometry(GeoJsonGeometryType.Point, new float[]
+new GeographicArea(GeoJsonType.Feature,new AreaGeometry(GeoJsonGeometryType.Point,new List<float>()
 {
-                        3.14f
-                    }), new AreaProperties(GeoJsonPropertiesSubType.Circle, 3.14))
-                },
-            }
-        },
+123.45F
+}),new AreaProperties(GeoJsonPropertiesSubType.Circle,123.45))
+},
+}
+},
                 })
                 {
                     Verbose = true,
                     IncludeEvidence = true,
                 },
             };
-            var operation = await client.MatchTrialsAsync(WaitUntil.Completed, trialMatcherData);
+            Operation<TrialMatcherResult> operation = await client.MatchTrialsAsync(WaitUntil.Completed, trialMatcherData);
+            TrialMatcherResult responseData = operation.Value;
         }
     }
 }
diff --git a/sdk/loadtestservice/Azure.Developer.LoadTesting/src/Generated/Docs/LoadTestAdministrationClient.xml b/sdk/loadtestservice/Azure.Developer.LoadTesting/src/Generated/Docs/LoadTestAdministrationClient.xml
index c902fef7a37c..568fcc5fa92b 100644
--- a/sdk/loadtestservice/Azure.Developer.LoadTesting/src/Generated/Docs/LoadTestAdministrationClient.xml
+++ b/sdk/loadtestservice/Azure.Developer.LoadTesting/src/Generated/Docs/LoadTestAdministrationClient.xml
@@ -2,88 +2,96 @@
 <doc>
   <members>
     <member name="CreateOrUpdateTestAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateTestAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateTestAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateTestAsync("<testId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateTestAsync("<testId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateTestAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
-
-var data = new {
-    passFailCriteria = new {
-        passFailMetrics = new {
-            key = new {
-                clientMetric = "response_time_ms",
-                aggregate = "count",
-                condition = "<condition>",
-                requestName = "<requestName>",
-                value = 123.45d,
-                action = "continue",
+This sample shows how to call CreateOrUpdateTestAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["passFailCriteria"] = new Dictionary<string, object>()
+    {
+        ["passFailMetrics"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>()
+            {
+                ["clientMetric"] = "response_time_ms",
+                ["aggregate"] = "count",
+                ["condition"] = "<condition>",
+                ["requestName"] = "<requestName>",
+                ["value"] = 123.45,
+                ["action"] = "continue",
             },
         },
     },
-    secrets = new {
-        key = new {
-            value = "<value>",
-            type = "AKV_SECRET_URI",
+    ["secrets"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["value"] = "<value>",
+            ["type"] = "AKV_SECRET_URI",
         },
     },
-    certificate = new {
-        value = "<value>",
-        type = "AKV_CERT_URI",
-        name = "<name>",
+    ["certificate"] = new Dictionary<string, object>()
+    {
+        ["value"] = "<value>",
+        ["type"] = "AKV_CERT_URI",
+        ["name"] = "<name>",
     },
-    environmentVariables = new {
-        key = "<String>",
+    ["environmentVariables"] = new Dictionary<string, object>()
+    {
+        ["key"] = "<environmentVariables>",
     },
-    loadTestConfiguration = new {
-        engineInstances = 1234,
-        splitAllCSVs = true,
-        quickStartTest = true,
-        optionalLoadTestConfig = new {
-            endpointUrl = "<endpointUrl>",
-            virtualUsers = 1234,
-            rampUpTime = 1234,
-            duration = 1234,
+    ["loadTestConfiguration"] = new Dictionary<string, object>()
+    {
+        ["engineInstances"] = 1234,
+        ["splitAllCSVs"] = true,
+        ["quickStartTest"] = true,
+        ["optionalLoadTestConfig"] = new Dictionary<string, object>()
+        {
+            ["endpointUrl"] = "<endpointUrl>",
+            ["virtualUsers"] = 1234,
+            ["rampUpTime"] = 1234,
+            ["duration"] = 1234,
         },
     },
-    description = "<description>",
-    displayName = "<displayName>",
-    subnetId = "<subnetId>",
-    keyvaultReferenceIdentityType = "<keyvaultReferenceIdentityType>",
-    keyvaultReferenceIdentityId = "<keyvaultReferenceIdentityId>",
-};
-
-Response response = await client.CreateOrUpdateTestAsync("<testId>", RequestContent.Create(data));
+    ["description"] = "<description>",
+    ["displayName"] = "<displayName>",
+    ["subnetId"] = "<subnetId>",
+    ["keyvaultReferenceIdentityType"] = "<keyvaultReferenceIdentityType>",
+    ["keyvaultReferenceIdentityId"] = "<keyvaultReferenceIdentityId>",
+});
+Response response = await client.CreateOrUpdateTestAsync("<testId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -131,92 +139,99 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateTest(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateTest with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateTest and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-Response response = client.CreateOrUpdateTest("<testId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdateTest("<testId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateTest with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
-
-var data = new {
-    passFailCriteria = new {
-        passFailMetrics = new {
-            key = new {
-                clientMetric = "response_time_ms",
-                aggregate = "count",
-                condition = "<condition>",
-                requestName = "<requestName>",
-                value = 123.45d,
-                action = "continue",
+This sample shows how to call CreateOrUpdateTest with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["passFailCriteria"] = new Dictionary<string, object>()
+    {
+        ["passFailMetrics"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>()
+            {
+                ["clientMetric"] = "response_time_ms",
+                ["aggregate"] = "count",
+                ["condition"] = "<condition>",
+                ["requestName"] = "<requestName>",
+                ["value"] = 123.45,
+                ["action"] = "continue",
             },
         },
     },
-    secrets = new {
-        key = new {
-            value = "<value>",
-            type = "AKV_SECRET_URI",
+    ["secrets"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["value"] = "<value>",
+            ["type"] = "AKV_SECRET_URI",
         },
     },
-    certificate = new {
-        value = "<value>",
-        type = "AKV_CERT_URI",
-        name = "<name>",
+    ["certificate"] = new Dictionary<string, object>()
+    {
+        ["value"] = "<value>",
+        ["type"] = "AKV_CERT_URI",
+        ["name"] = "<name>",
     },
-    environmentVariables = new {
-        key = "<String>",
+    ["environmentVariables"] = new Dictionary<string, object>()
+    {
+        ["key"] = "<environmentVariables>",
     },
-    loadTestConfiguration = new {
-        engineInstances = 1234,
-        splitAllCSVs = true,
-        quickStartTest = true,
-        optionalLoadTestConfig = new {
-            endpointUrl = "<endpointUrl>",
-            virtualUsers = 1234,
-            rampUpTime = 1234,
-            duration = 1234,
+    ["loadTestConfiguration"] = new Dictionary<string, object>()
+    {
+        ["engineInstances"] = 1234,
+        ["splitAllCSVs"] = true,
+        ["quickStartTest"] = true,
+        ["optionalLoadTestConfig"] = new Dictionary<string, object>()
+        {
+            ["endpointUrl"] = "<endpointUrl>",
+            ["virtualUsers"] = 1234,
+            ["rampUpTime"] = 1234,
+            ["duration"] = 1234,
         },
     },
-    description = "<description>",
-    displayName = "<displayName>",
-    subnetId = "<subnetId>",
-    keyvaultReferenceIdentityType = "<keyvaultReferenceIdentityType>",
-    keyvaultReferenceIdentityId = "<keyvaultReferenceIdentityId>",
-};
-
-Response response = client.CreateOrUpdateTest("<testId>", RequestContent.Create(data));
+    ["description"] = "<description>",
+    ["displayName"] = "<displayName>",
+    ["subnetId"] = "<subnetId>",
+    ["keyvaultReferenceIdentityType"] = "<keyvaultReferenceIdentityType>",
+    ["keyvaultReferenceIdentityId"] = "<keyvaultReferenceIdentityId>",
+});
+Response response = client.CreateOrUpdateTest("<testId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -264,60 +279,86 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteTestAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteTestAsync with required parameters.
+      <example>
+This sample shows how to call DeleteTestAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
 Response response = await client.DeleteTestAsync("<testId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteTestAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+Response response = await client.DeleteTestAsync("<testId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteTest(string,RequestContext)">
-<example>
-This sample shows how to call DeleteTest with required parameters.
+      <example>
+This sample shows how to call DeleteTest.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
 Response response = client.DeleteTest("<testId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteTest with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+Response response = client.DeleteTest("<testId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetTestAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetTestAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTestAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+Response response = await client.GetTestAsync("<testId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTestAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
 Response response = await client.GetTestAsync("<testId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -365,34 +406,44 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTest(string,RequestContext)">
-<example>
-This sample shows how to call GetTest with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTest and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+Response response = client.GetTest("<testId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTest with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
 Response response = client.GetTest("<testId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -440,20 +491,28 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
-    </member>
-    <member name="UploadTestFileAsync(string,string,RequestContent,string,RequestContext)">
-    </member>
-    <member name="UploadTestFile(string,string,RequestContent,string,RequestContext)">
+]]></code></example>
     </member>
+    <member name="UploadTestFileAsync(string,string,RequestContent,string,RequestContext)" />
+    <member name="UploadTestFile(string,string,RequestContent,string,RequestContext)" />
     <member name="GetTestFileAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetTestFileAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTestFileAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+Response response = await client.GetTestFileAsync("<testId>", "<fileName>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTestFileAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
 Response response = await client.GetTestFileAsync("<testId>", "<fileName>");
 
@@ -464,16 +523,26 @@ Console.WriteLine(result.GetProperty("fileType").ToString());
 Console.WriteLine(result.GetProperty("expireDateTime").ToString());
 Console.WriteLine(result.GetProperty("validationStatus").ToString());
 Console.WriteLine(result.GetProperty("validationFailureDetails").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTestFile(string,string,RequestContext)">
-<example>
-This sample shows how to call GetTestFile with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTestFile and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+Response response = client.GetTestFile("<testId>", "<fileName>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTestFile with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
 Response response = client.GetTestFile("<testId>", "<fileName>");
 
@@ -484,368 +553,481 @@ Console.WriteLine(result.GetProperty("fileType").ToString());
 Console.WriteLine(result.GetProperty("expireDateTime").ToString());
 Console.WriteLine(result.GetProperty("validationStatus").ToString());
 Console.WriteLine(result.GetProperty("validationFailureDetails").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteTestFileAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteTestFileAsync with required parameters.
+      <example>
+This sample shows how to call DeleteTestFileAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
 Response response = await client.DeleteTestFileAsync("<testId>", "<fileName>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteTestFileAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+Response response = await client.DeleteTestFileAsync("<testId>", "<fileName>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteTestFile(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteTestFile with required parameters.
+      <example>
+This sample shows how to call DeleteTestFile.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
 Response response = client.DeleteTestFile("<testId>", "<fileName>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteTestFile with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+Response response = client.DeleteTestFile("<testId>", "<fileName>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAppComponentsAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAppComponentsAsync with required parameters and request content and parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
-
-var data = new {
-    components = new {
-        key = new {
-            resourceName = "<resourceName>",
-            resourceType = "<resourceType>",
-            displayName = "<displayName>",
-            kind = "<kind>",
-        },
+      <example>
+This sample shows how to call CreateOrUpdateAppComponentsAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["components"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
+});
+Response response = await client.CreateOrUpdateAppComponentsAsync("<testId>", content);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
+]]></code>
+This sample shows how to call CreateOrUpdateAppComponentsAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-Response response = await client.CreateOrUpdateAppComponentsAsync("<testId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["components"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["resourceName"] = "<resourceName>",
+            ["resourceType"] = "<resourceType>",
+            ["displayName"] = "<displayName>",
+            ["kind"] = "<kind>",
+        },
+    },
+});
+Response response = await client.CreateOrUpdateAppComponentsAsync("<testId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
 Console.WriteLine(result.GetProperty("testId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAppComponents(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAppComponents with required parameters and request content and parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
-
-var data = new {
-    components = new {
-        key = new {
-            resourceName = "<resourceName>",
-            resourceType = "<resourceType>",
-            displayName = "<displayName>",
-            kind = "<kind>",
-        },
+      <example>
+This sample shows how to call CreateOrUpdateAppComponents and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["components"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
+});
+Response response = client.CreateOrUpdateAppComponents("<testId>", content);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
+]]></code>
+This sample shows how to call CreateOrUpdateAppComponents with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-Response response = client.CreateOrUpdateAppComponents("<testId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["components"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["resourceName"] = "<resourceName>",
+            ["resourceType"] = "<resourceType>",
+            ["displayName"] = "<displayName>",
+            ["kind"] = "<kind>",
+        },
+    },
+});
+Response response = client.CreateOrUpdateAppComponents("<testId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
 Console.WriteLine(result.GetProperty("testId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAppComponentsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetAppComponentsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAppComponentsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
 Response response = await client.GetAppComponentsAsync("<testId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
+]]></code>
+This sample shows how to call GetAppComponentsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+Response response = await client.GetAppComponentsAsync("<testId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
 Console.WriteLine(result.GetProperty("testId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAppComponents(string,RequestContext)">
-<example>
-This sample shows how to call GetAppComponents with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAppComponents and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
 Response response = client.GetAppComponents("<testId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
+]]></code>
+This sample shows how to call GetAppComponents with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+Response response = client.GetAppComponents("<testId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
 Console.WriteLine(result.GetProperty("testId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateServerMetricsConfigAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateServerMetricsConfigAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateServerMetricsConfigAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateServerMetricsConfigAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
-
-var data = new {
-    metrics = new {
-        key = new {
-            resourceId = "<resourceId>",
-            metricNamespace = "<metricNamespace>",
-            displayDescription = "<displayDescription>",
-            name = "<name>",
-            aggregation = "<aggregation>",
-            unit = "<unit>",
-            resourceType = "<resourceType>",
+This sample shows how to call CreateOrUpdateServerMetricsConfigAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["metrics"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["resourceId"] = "<resourceId>",
+            ["metricNamespace"] = "<metricNamespace>",
+            ["displayDescription"] = "<displayDescription>",
+            ["name"] = "<name>",
+            ["aggregation"] = "<aggregation>",
+            ["unit"] = "<unit>",
+            ["resourceType"] = "<resourceType>",
         },
     },
-};
-
-Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("testId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateServerMetricsConfig(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateServerMetricsConfig with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateServerMetricsConfig and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-Response response = client.CreateOrUpdateServerMetricsConfig("<testId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdateServerMetricsConfig("<testId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateServerMetricsConfig with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
-
-var data = new {
-    metrics = new {
-        key = new {
-            resourceId = "<resourceId>",
-            metricNamespace = "<metricNamespace>",
-            displayDescription = "<displayDescription>",
-            name = "<name>",
-            aggregation = "<aggregation>",
-            unit = "<unit>",
-            resourceType = "<resourceType>",
+This sample shows how to call CreateOrUpdateServerMetricsConfig with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["metrics"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["resourceId"] = "<resourceId>",
+            ["metricNamespace"] = "<metricNamespace>",
+            ["displayDescription"] = "<displayDescription>",
+            ["name"] = "<name>",
+            ["aggregation"] = "<aggregation>",
+            ["unit"] = "<unit>",
+            ["resourceType"] = "<resourceType>",
         },
     },
-};
-
-Response response = client.CreateOrUpdateServerMetricsConfig("<testId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdateServerMetricsConfig("<testId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("testId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetServerMetricsConfigAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetServerMetricsConfigAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetServerMetricsConfigAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+Response response = await client.GetServerMetricsConfigAsync("<testId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetServerMetricsConfigAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
 Response response = await client.GetServerMetricsConfigAsync("<testId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("testId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetServerMetricsConfig(string,RequestContext)">
-<example>
-This sample shows how to call GetServerMetricsConfig with required parameters and parse the result.
+      <example>
+This sample shows how to call GetServerMetricsConfig and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+Response response = client.GetServerMetricsConfig("<testId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetServerMetricsConfig with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
 Response response = client.GetServerMetricsConfig("<testId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("testId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
-    </member>
-    <member name="GetTestsAsync(string,string,DateTimeOffset?,DateTimeOffset?,int?,RequestContext)">
-    </member>
-    <member name="GetTests(string,string,DateTimeOffset?,DateTimeOffset?,int?,RequestContext)">
+]]></code></example>
     </member>
+    <member name="GetTestsAsync(string,string,DateTimeOffset?,DateTimeOffset?,int?,RequestContext)" />
+    <member name="GetTests(string,string,DateTimeOffset?,DateTimeOffset?,int?,RequestContext)" />
     <member name="GetTestFilesAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetTestFilesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTestFilesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-await foreach (var item in client.GetTestFilesAsync("<testId>"))
+await foreach (BinaryData item in client.GetTestFilesAsync("<testId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("url").ToString());
-    Console.WriteLine(result.GetProperty("fileName").ToString());
-    Console.WriteLine(result.GetProperty("fileType").ToString());
-    Console.WriteLine(result.GetProperty("expireDateTime").ToString());
-    Console.WriteLine(result.GetProperty("validationStatus").ToString());
-    Console.WriteLine(result.GetProperty("validationFailureDetails").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetTestFilesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetTestFilesAsync("<testId>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("url").ToString());
+    Console.WriteLine(result[0].GetProperty("fileName").ToString());
+    Console.WriteLine(result[0].GetProperty("fileType").ToString());
+    Console.WriteLine(result[0].GetProperty("expireDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("validationStatus").ToString());
+    Console.WriteLine(result[0].GetProperty("validationFailureDetails").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetTestFiles(string,RequestContext)">
-<example>
-This sample shows how to call GetTestFiles with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTestFiles and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestAdministrationClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-foreach (var item in client.GetTestFiles("<testId>"))
+foreach (BinaryData item in client.GetTestFiles("<testId>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("url").ToString());
-    Console.WriteLine(result.GetProperty("fileName").ToString());
-    Console.WriteLine(result.GetProperty("fileType").ToString());
-    Console.WriteLine(result.GetProperty("expireDateTime").ToString());
-    Console.WriteLine(result.GetProperty("validationStatus").ToString());
-    Console.WriteLine(result.GetProperty("validationFailureDetails").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetTestFiles with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetTestFiles("<testId>"))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("url").ToString());
+    Console.WriteLine(result[0].GetProperty("fileName").ToString());
+    Console.WriteLine(result[0].GetProperty("fileType").ToString());
+    Console.WriteLine(result[0].GetProperty("expireDateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("validationStatus").ToString());
+    Console.WriteLine(result[0].GetProperty("validationFailureDetails").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/loadtestservice/Azure.Developer.LoadTesting/src/Generated/Docs/LoadTestRunClient.xml b/sdk/loadtestservice/Azure.Developer.LoadTesting/src/Generated/Docs/LoadTestRunClient.xml
index 0fb3996a256b..9e6cac7b72c7 100644
--- a/sdk/loadtestservice/Azure.Developer.LoadTesting/src/Generated/Docs/LoadTestRunClient.xml
+++ b/sdk/loadtestservice/Azure.Developer.LoadTesting/src/Generated/Docs/LoadTestRunClient.xml
@@ -1,50 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <doc>
   <members>
-    <member name="CreateOrUpdateTestRunAsync(string,RequestContent,string,RequestContext)">
-    </member>
-    <member name="CreateOrUpdateTestRun(string,RequestContent,string,RequestContext)">
-    </member>
+    <member name="CreateOrUpdateTestRunAsync(string,RequestContent,string,RequestContext)" />
+    <member name="CreateOrUpdateTestRun(string,RequestContent,string,RequestContext)" />
     <member name="GetTestRunAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetTestRunAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTestRunAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = await client.GetTestRunAsync("<testRunId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTestRunAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = await client.GetTestRunAsync("<testRunId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errorDetails")[0].GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("transaction").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sampleCount").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorCount").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorPct").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("meanResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("medianResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("maxResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("minResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct1ResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct2ResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct3ResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("throughput").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("receivedKBytesPerSec").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sentKBytesPerSec").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("transaction").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sampleCount").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorCount").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorPct").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("meanResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("medianResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("maxResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("minResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct1ResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct2ResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct3ResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("throughput").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("receivedKBytesPerSec").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sentKBytesPerSec").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -111,49 +120,59 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTestRun(string,RequestContext)">
-<example>
-This sample shows how to call GetTestRun with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTestRun and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = client.GetTestRun("<testRunId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTestRun with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = client.GetTestRun("<testRunId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errorDetails")[0].GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("transaction").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sampleCount").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorCount").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorPct").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("meanResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("medianResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("maxResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("minResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct1ResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct2ResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct3ResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("throughput").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("receivedKBytesPerSec").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sentKBytesPerSec").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("transaction").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sampleCount").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorCount").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorPct").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("meanResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("medianResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("maxResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("minResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct1ResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct2ResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct3ResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("throughput").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("receivedKBytesPerSec").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sentKBytesPerSec").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -220,42 +239,68 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteTestRunAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteTestRunAsync with required parameters.
+      <example>
+This sample shows how to call DeleteTestRunAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = await client.DeleteTestRunAsync("<testRunId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteTestRunAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = await client.DeleteTestRunAsync("<testRunId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteTestRun(string,RequestContext)">
-<example>
-This sample shows how to call DeleteTestRun with required parameters.
+      <example>
+This sample shows how to call DeleteTestRun.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = client.DeleteTestRun("<testRunId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteTestRun with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = client.DeleteTestRun("<testRunId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetTestRunFileAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetTestRunFileAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTestRunFileAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = await client.GetTestRunFileAsync("<testRunId>", "<fileName>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTestRunFileAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = await client.GetTestRunFileAsync("<testRunId>", "<fileName>");
 
@@ -266,16 +311,26 @@ Console.WriteLine(result.GetProperty("fileType").ToString());
 Console.WriteLine(result.GetProperty("expireDateTime").ToString());
 Console.WriteLine(result.GetProperty("validationStatus").ToString());
 Console.WriteLine(result.GetProperty("validationFailureDetails").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTestRunFile(string,string,RequestContext)">
-<example>
-This sample shows how to call GetTestRunFile with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTestRunFile and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = client.GetTestRunFile("<testRunId>", "<fileName>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTestRunFile with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = client.GetTestRunFile("<testRunId>", "<fileName>");
 
@@ -286,49 +341,59 @@ Console.WriteLine(result.GetProperty("fileType").ToString());
 Console.WriteLine(result.GetProperty("expireDateTime").ToString());
 Console.WriteLine(result.GetProperty("validationStatus").ToString());
 Console.WriteLine(result.GetProperty("validationFailureDetails").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="StopTestRunAsync(string,RequestContext)">
-<example>
-This sample shows how to call StopTestRunAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call StopTestRunAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = await client.StopTestRunAsync("<testRunId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call StopTestRunAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = await client.StopTestRunAsync("<testRunId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errorDetails")[0].GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("transaction").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sampleCount").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorCount").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorPct").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("meanResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("medianResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("maxResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("minResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct1ResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct2ResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct3ResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("throughput").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("receivedKBytesPerSec").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sentKBytesPerSec").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("transaction").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sampleCount").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorCount").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorPct").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("meanResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("medianResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("maxResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("minResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct1ResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct2ResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct3ResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("throughput").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("receivedKBytesPerSec").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sentKBytesPerSec").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -395,49 +460,59 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="StopTestRun(string,RequestContext)">
-<example>
-This sample shows how to call StopTestRun with required parameters and parse the result.
+      <example>
+This sample shows how to call StopTestRun and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = client.StopTestRun("<testRunId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call StopTestRun with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = client.StopTestRun("<testRunId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("errorDetails")[0].GetProperty("message").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("transaction").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sampleCount").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorCount").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorPct").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("meanResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("medianResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("maxResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("minResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct1ResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct2ResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct3ResTime").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("throughput").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("receivedKBytesPerSec").ToString());
-Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sentKBytesPerSec").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("transaction").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sampleCount").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorCount").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorPct").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("meanResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("medianResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("maxResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("minResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct1ResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct2ResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct3ResTime").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("throughput").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("receivedKBytesPerSec").ToString());
+Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sentKBytesPerSec").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
 Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -504,48 +579,78 @@ Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetMetricNamespacesAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetMetricNamespacesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMetricNamespacesAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = await client.GetMetricNamespacesAsync("<testRunId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("value")[0].ToString());
+]]></code>
+This sample shows how to call GetMetricNamespacesAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = await client.GetMetricNamespacesAsync("<testRunId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetMetricNamespaces(string,RequestContext)">
-<example>
-This sample shows how to call GetMetricNamespaces with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMetricNamespaces and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = client.GetMetricNamespaces("<testRunId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("value")[0].ToString());
+]]></code>
+This sample shows how to call GetMetricNamespaces with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = client.GetMetricNamespaces("<testRunId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetMetricDefinitionsAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetMetricDefinitionsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMetricDefinitionsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = await client.GetMetricDefinitionsAsync("<testRunId>", "<metricNamespace>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("value")[0].ToString());
+]]></code>
+This sample shows how to call GetMetricDefinitionsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = await client.GetMetricDefinitionsAsync("<testRunId>", "<metricNamespace>");
 
@@ -559,16 +664,26 @@ Console.WriteLine(result.GetProperty("value")[0].GetProperty("primaryAggregation
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("supportedAggregationTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("unit").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("metricAvailabilities")[0].GetProperty("timeGrain").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetMetricDefinitions(string,string,RequestContext)">
-<example>
-This sample shows how to call GetMetricDefinitions with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMetricDefinitions and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = client.GetMetricDefinitions("<testRunId>", "<metricNamespace>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("value")[0].ToString());
+]]></code>
+This sample shows how to call GetMetricDefinitions with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = client.GetMetricDefinitions("<testRunId>", "<metricNamespace>");
 
@@ -582,444 +697,519 @@ Console.WriteLine(result.GetProperty("value")[0].GetProperty("primaryAggregation
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("supportedAggregationTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("unit").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("metricAvailabilities")[0].GetProperty("timeGrain").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAppComponentsAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAppComponentsAsync with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAppComponentsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
-
-var data = new {
-    components = new {
-        key = new {
-            resourceName = "<resourceName>",
-            resourceType = "<resourceType>",
-            displayName = "<displayName>",
-            kind = "<kind>",
-        },
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["components"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
+});
+Response response = await client.CreateOrUpdateAppComponentsAsync("<testRunId>", content);
 
-Response response = await client.CreateOrUpdateAppComponentsAsync("<testRunId>", RequestContent.Create(data));
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
+]]></code>
+This sample shows how to call CreateOrUpdateAppComponentsAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["components"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["resourceName"] = "<resourceName>",
+            ["resourceType"] = "<resourceType>",
+            ["displayName"] = "<displayName>",
+            ["kind"] = "<kind>",
+        },
+    },
+});
+Response response = await client.CreateOrUpdateAppComponentsAsync("<testRunId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
 Console.WriteLine(result.GetProperty("testRunId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAppComponents(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAppComponents with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAppComponents and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
-
-var data = new {
-    components = new {
-        key = new {
-            resourceName = "<resourceName>",
-            resourceType = "<resourceType>",
-            displayName = "<displayName>",
-            kind = "<kind>",
-        },
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["components"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-};
+});
+Response response = client.CreateOrUpdateAppComponents("<testRunId>", content);
 
-Response response = client.CreateOrUpdateAppComponents("<testRunId>", RequestContent.Create(data));
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
+]]></code>
+This sample shows how to call CreateOrUpdateAppComponents with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["components"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["resourceName"] = "<resourceName>",
+            ["resourceType"] = "<resourceType>",
+            ["displayName"] = "<displayName>",
+            ["kind"] = "<kind>",
+        },
+    },
+});
+Response response = client.CreateOrUpdateAppComponents("<testRunId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
 Console.WriteLine(result.GetProperty("testRunId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAppComponentsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetAppComponentsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAppComponentsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = await client.GetAppComponentsAsync("<testRunId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
+]]></code>
+This sample shows how to call GetAppComponentsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = await client.GetAppComponentsAsync("<testRunId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
 Console.WriteLine(result.GetProperty("testRunId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAppComponents(string,RequestContext)">
-<example>
-This sample shows how to call GetAppComponents with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAppComponents and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = client.GetAppComponents("<testRunId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
+]]></code>
+This sample shows how to call GetAppComponents with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = client.GetAppComponents("<testRunId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
 Console.WriteLine(result.GetProperty("testRunId").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateServerMetricsConfigAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateServerMetricsConfigAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateServerMetricsConfigAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testRunId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testRunId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateServerMetricsConfigAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateServerMetricsConfigAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
-
-var data = new {
-    metrics = new {
-        key = new {
-            resourceId = "<resourceId>",
-            metricNamespace = "<metricNamespace>",
-            displayDescription = "<displayDescription>",
-            name = "<name>",
-            aggregation = "<aggregation>",
-            unit = "<unit>",
-            resourceType = "<resourceType>",
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["metrics"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["resourceId"] = "<resourceId>",
+            ["metricNamespace"] = "<metricNamespace>",
+            ["displayDescription"] = "<displayDescription>",
+            ["name"] = "<name>",
+            ["aggregation"] = "<aggregation>",
+            ["unit"] = "<unit>",
+            ["resourceType"] = "<resourceType>",
         },
     },
-};
-
-Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testRunId>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testRunId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("testRunId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateServerMetricsConfig(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateServerMetricsConfig with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateServerMetricsConfig and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-Response response = client.CreateOrUpdateServerMetricsConfig("<testRunId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdateServerMetricsConfig("<testRunId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateServerMetricsConfig with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateServerMetricsConfig with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
-
-var data = new {
-    metrics = new {
-        key = new {
-            resourceId = "<resourceId>",
-            metricNamespace = "<metricNamespace>",
-            displayDescription = "<displayDescription>",
-            name = "<name>",
-            aggregation = "<aggregation>",
-            unit = "<unit>",
-            resourceType = "<resourceType>",
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["metrics"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["resourceId"] = "<resourceId>",
+            ["metricNamespace"] = "<metricNamespace>",
+            ["displayDescription"] = "<displayDescription>",
+            ["name"] = "<name>",
+            ["aggregation"] = "<aggregation>",
+            ["unit"] = "<unit>",
+            ["resourceType"] = "<resourceType>",
         },
     },
-};
-
-Response response = client.CreateOrUpdateServerMetricsConfig("<testRunId>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdateServerMetricsConfig("<testRunId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("testRunId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetServerMetricsConfigAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetServerMetricsConfigAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetServerMetricsConfigAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = await client.GetServerMetricsConfigAsync("<testRunId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetServerMetricsConfigAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = await client.GetServerMetricsConfigAsync("<testRunId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("testRunId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetServerMetricsConfig(string,RequestContext)">
-<example>
-This sample shows how to call GetServerMetricsConfig with required parameters and parse the result.
+      <example>
+This sample shows how to call GetServerMetricsConfig and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
+
+Response response = client.GetServerMetricsConfig("<testRunId>");
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetServerMetricsConfig with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
 Response response = client.GetServerMetricsConfig("<testRunId>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("testRunId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
 Console.WriteLine(result.GetProperty("createdDateTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedBy").ToString());
-]]></code>
-</example>
-    </member>
-    <member name="GetTestRunsAsync(string,string,string,DateTimeOffset?,DateTimeOffset?,string,int?,RequestContext)">
-    </member>
-    <member name="GetTestRuns(string,string,string,DateTimeOffset?,DateTimeOffset?,string,int?,RequestContext)">
+]]></code></example>
     </member>
+    <member name="GetTestRunsAsync(string,string,string,DateTimeOffset?,DateTimeOffset?,string,int?,RequestContext)" />
+    <member name="GetTestRuns(string,string,string,DateTimeOffset?,DateTimeOffset?,string,int?,RequestContext)" />
     <member name="GetMetricsAsync(string,string,string,string,RequestContent,string,string,RequestContext)">
-<example>
-This sample shows how to call GetMetricsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMetricsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-var data = new {};
-
-await foreach (var item in client.GetMetricsAsync("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", RequestContent.Create(data)))
+RequestContent content = null;
+await foreach (BinaryData item in client.GetMetricsAsync("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", content))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-This sample shows how to call GetMetricsAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call GetMetricsAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
-
-var data = new {
-    filters = new[] {
-        new {
-            name = "<name>",
-            values = new[] {
-                "<String>"
-            },
-        }
-    },
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-await foreach (var item in client.GetMetricsAsync("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", RequestContent.Create(data), "<aggregation>", "<interval>"))
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["filters"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["values"] = new List<object>()
+{
+"<values>"
+},
+}
+},
+});
+await foreach (BinaryData item in client.GetMetricsAsync("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", content, aggregation: "<aggregation>", interval: "PT5S"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("data")[0].GetProperty("timestamp").ToString());
-    Console.WriteLine(result.GetProperty("data")[0].GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("dimensionValues")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("dimensionValues")[0].GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("data")[0].GetProperty("timestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("data")[0].GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("dimensionValues")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("dimensionValues")[0].GetProperty("value").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetMetrics(string,string,string,string,RequestContent,string,string,RequestContext)">
-<example>
-This sample shows how to call GetMetrics with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMetrics and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-var data = new {};
-
-foreach (var item in client.GetMetrics("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", RequestContent.Create(data)))
+RequestContent content = null;
+foreach (BinaryData item in client.GetMetrics("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", content))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-This sample shows how to call GetMetrics with all parameters and request content, and how to parse the result.
+This sample shows how to call GetMetrics with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
-
-var data = new {
-    filters = new[] {
-        new {
-            name = "<name>",
-            values = new[] {
-                "<String>"
-            },
-        }
-    },
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-foreach (var item in client.GetMetrics("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", RequestContent.Create(data), "<aggregation>", "<interval>"))
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["filters"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["values"] = new List<object>()
+{
+"<values>"
+},
+}
+},
+});
+foreach (BinaryData item in client.GetMetrics("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", content, aggregation: "<aggregation>", interval: "PT5S"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("data")[0].GetProperty("timestamp").ToString());
-    Console.WriteLine(result.GetProperty("data")[0].GetProperty("value").ToString());
-    Console.WriteLine(result.GetProperty("dimensionValues")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("dimensionValues")[0].GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("data")[0].GetProperty("timestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("data")[0].GetProperty("value").ToString());
+    Console.WriteLine(result[0].GetProperty("dimensionValues")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("dimensionValues")[0].GetProperty("value").ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetMetricDimensionValuesAsync(string,string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetMetricDimensionValuesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMetricDimensionValuesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-await foreach (var item in client.GetMetricDimensionValuesAsync("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>"))
+await foreach (BinaryData item in client.GetMetricDimensionValuesAsync("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-This sample shows how to call GetMetricDimensionValuesAsync with all parameters, and how to parse the result.
+This sample shows how to call GetMetricDimensionValuesAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-await foreach (var item in client.GetMetricDimensionValuesAsync("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>", "<interval>"))
+await foreach (BinaryData item in client.GetMetricDimensionValuesAsync("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>", interval: "PT5S"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetMetricDimensionValues(string,string,string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetMetricDimensionValues with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMetricDimensionValues and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-foreach (var item in client.GetMetricDimensionValues("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>"))
+foreach (BinaryData item in client.GetMetricDimensionValues("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-This sample shows how to call GetMetricDimensionValues with all parameters, and how to parse the result.
+This sample shows how to call GetMetricDimensionValues with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LoadTestRunClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-foreach (var item in client.GetMetricDimensionValues("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>", "<interval>"))
+foreach (BinaryData item in client.GetMetricDimensionValues("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>", interval: "PT5S"))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.ToString());
+    Console.WriteLine(result[0].ToString());
 }
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/loadtestservice/Azure.Developer.LoadTesting/tests/Generated/Samples/Samples_LoadTestAdministrationClient.cs b/sdk/loadtestservice/Azure.Developer.LoadTesting/tests/Generated/Samples/Samples_LoadTestAdministrationClient.cs
index 7bdc52dea772..45b9e42e1986 100644
--- a/sdk/loadtestservice/Azure.Developer.LoadTesting/tests/Generated/Samples/Samples_LoadTestAdministrationClient.cs
+++ b/sdk/loadtestservice/Azure.Developer.LoadTesting/tests/Generated/Samples/Samples_LoadTestAdministrationClient.cs
@@ -7,11 +7,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
+using Azure.Developer.LoadTesting;
 using Azure.Identity;
 using NUnit.Framework;
 
@@ -23,13 +23,12 @@ public class Samples_LoadTestAdministrationClient
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateTest()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdateTest("<testId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdateTest("<testId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -39,82 +38,81 @@ public void Example_CreateOrUpdateTest()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateTest_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                passFailCriteria = new
+                ["passFailCriteria"] = new Dictionary<string, object>()
                 {
-                    passFailMetrics = new
+                    ["passFailMetrics"] = new Dictionary<string, object>()
                     {
-                        key = new
+                        ["key"] = new Dictionary<string, object>()
                         {
-                            clientMetric = "response_time_ms",
-                            aggregate = "count",
-                            condition = "<condition>",
-                            requestName = "<requestName>",
-                            value = 123.45d,
-                            action = "continue",
+                            ["clientMetric"] = "response_time_ms",
+                            ["aggregate"] = "count",
+                            ["condition"] = "<condition>",
+                            ["requestName"] = "<requestName>",
+                            ["value"] = 123.45,
+                            ["action"] = "continue",
                         },
                     },
                 },
-                secrets = new
+                ["secrets"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        value = "<value>",
-                        type = "AKV_SECRET_URI",
+                        ["value"] = "<value>",
+                        ["type"] = "AKV_SECRET_URI",
                     },
                 },
-                certificate = new
+                ["certificate"] = new Dictionary<string, object>()
                 {
-                    value = "<value>",
-                    type = "AKV_CERT_URI",
-                    name = "<name>",
+                    ["value"] = "<value>",
+                    ["type"] = "AKV_CERT_URI",
+                    ["name"] = "<name>",
                 },
-                environmentVariables = new
+                ["environmentVariables"] = new Dictionary<string, object>()
                 {
-                    key = "<String>",
+                    ["key"] = "<environmentVariables>",
                 },
-                loadTestConfiguration = new
+                ["loadTestConfiguration"] = new Dictionary<string, object>()
                 {
-                    engineInstances = 1234,
-                    splitAllCSVs = true,
-                    quickStartTest = true,
-                    optionalLoadTestConfig = new
+                    ["engineInstances"] = 1234,
+                    ["splitAllCSVs"] = true,
+                    ["quickStartTest"] = true,
+                    ["optionalLoadTestConfig"] = new Dictionary<string, object>()
                     {
-                        endpointUrl = "<endpointUrl>",
-                        virtualUsers = 1234,
-                        rampUpTime = 1234,
-                        duration = 1234,
+                        ["endpointUrl"] = "<endpointUrl>",
+                        ["virtualUsers"] = 1234,
+                        ["rampUpTime"] = 1234,
+                        ["duration"] = 1234,
                     },
                 },
-                description = "<description>",
-                displayName = "<displayName>",
-                subnetId = "<subnetId>",
-                keyvaultReferenceIdentityType = "<keyvaultReferenceIdentityType>",
-                keyvaultReferenceIdentityId = "<keyvaultReferenceIdentityId>",
-            };
-
-            Response response = client.CreateOrUpdateTest("<testId>", RequestContent.Create(data));
+                ["description"] = "<description>",
+                ["displayName"] = "<displayName>",
+                ["subnetId"] = "<subnetId>",
+                ["keyvaultReferenceIdentityType"] = "<keyvaultReferenceIdentityType>",
+                ["keyvaultReferenceIdentityId"] = "<keyvaultReferenceIdentityId>",
+            });
+            Response response = client.CreateOrUpdateTest("<testId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -168,13 +166,12 @@ public void Example_CreateOrUpdateTest_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateTest_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            Response response = await client.CreateOrUpdateTestAsync("<testId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateTestAsync("<testId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -184,82 +181,81 @@ public async Task Example_CreateOrUpdateTest_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateTest_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                passFailCriteria = new
+                ["passFailCriteria"] = new Dictionary<string, object>()
                 {
-                    passFailMetrics = new
+                    ["passFailMetrics"] = new Dictionary<string, object>()
                     {
-                        key = new
+                        ["key"] = new Dictionary<string, object>()
                         {
-                            clientMetric = "response_time_ms",
-                            aggregate = "count",
-                            condition = "<condition>",
-                            requestName = "<requestName>",
-                            value = 123.45d,
-                            action = "continue",
+                            ["clientMetric"] = "response_time_ms",
+                            ["aggregate"] = "count",
+                            ["condition"] = "<condition>",
+                            ["requestName"] = "<requestName>",
+                            ["value"] = 123.45,
+                            ["action"] = "continue",
                         },
                     },
                 },
-                secrets = new
+                ["secrets"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        value = "<value>",
-                        type = "AKV_SECRET_URI",
+                        ["value"] = "<value>",
+                        ["type"] = "AKV_SECRET_URI",
                     },
                 },
-                certificate = new
+                ["certificate"] = new Dictionary<string, object>()
                 {
-                    value = "<value>",
-                    type = "AKV_CERT_URI",
-                    name = "<name>",
+                    ["value"] = "<value>",
+                    ["type"] = "AKV_CERT_URI",
+                    ["name"] = "<name>",
                 },
-                environmentVariables = new
+                ["environmentVariables"] = new Dictionary<string, object>()
                 {
-                    key = "<String>",
+                    ["key"] = "<environmentVariables>",
                 },
-                loadTestConfiguration = new
+                ["loadTestConfiguration"] = new Dictionary<string, object>()
                 {
-                    engineInstances = 1234,
-                    splitAllCSVs = true,
-                    quickStartTest = true,
-                    optionalLoadTestConfig = new
+                    ["engineInstances"] = 1234,
+                    ["splitAllCSVs"] = true,
+                    ["quickStartTest"] = true,
+                    ["optionalLoadTestConfig"] = new Dictionary<string, object>()
                     {
-                        endpointUrl = "<endpointUrl>",
-                        virtualUsers = 1234,
-                        rampUpTime = 1234,
-                        duration = 1234,
+                        ["endpointUrl"] = "<endpointUrl>",
+                        ["virtualUsers"] = 1234,
+                        ["rampUpTime"] = 1234,
+                        ["duration"] = 1234,
                     },
                 },
-                description = "<description>",
-                displayName = "<displayName>",
-                subnetId = "<subnetId>",
-                keyvaultReferenceIdentityType = "<keyvaultReferenceIdentityType>",
-                keyvaultReferenceIdentityId = "<keyvaultReferenceIdentityId>",
-            };
-
-            Response response = await client.CreateOrUpdateTestAsync("<testId>", RequestContent.Create(data));
+                ["description"] = "<description>",
+                ["displayName"] = "<displayName>",
+                ["subnetId"] = "<subnetId>",
+                ["keyvaultReferenceIdentityType"] = "<keyvaultReferenceIdentityType>",
+                ["keyvaultReferenceIdentityId"] = "<keyvaultReferenceIdentityId>",
+            });
+            Response response = await client.CreateOrUpdateTestAsync("<testId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -313,9 +309,9 @@ public async Task Example_CreateOrUpdateTest_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTest()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = client.DeleteTest("<testId>");
             Console.WriteLine(response.Status);
@@ -325,9 +321,9 @@ public void Example_DeleteTest()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTest_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = client.DeleteTest("<testId>");
             Console.WriteLine(response.Status);
@@ -337,9 +333,9 @@ public void Example_DeleteTest_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTest_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = await client.DeleteTestAsync("<testId>");
             Console.WriteLine(response.Status);
@@ -349,9 +345,9 @@ public async Task Example_DeleteTest_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTest_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = await client.DeleteTestAsync("<testId>");
             Console.WriteLine(response.Status);
@@ -361,9 +357,9 @@ public async Task Example_DeleteTest_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTest()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = client.GetTest("<testId>");
 
@@ -375,27 +371,27 @@ public void Example_GetTest()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTest_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = client.GetTest("<testId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -449,9 +445,9 @@ public void Example_GetTest_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTest_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = await client.GetTestAsync("<testId>");
 
@@ -463,27 +459,27 @@ public async Task Example_GetTest_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTest_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = await client.GetTestAsync("<testId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -537,9 +533,9 @@ public async Task Example_GetTest_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTestFile()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = client.GetTestFile("<testId>", "<fileName>");
 
@@ -551,9 +547,9 @@ public void Example_GetTestFile()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTestFile_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = client.GetTestFile("<testId>", "<fileName>");
 
@@ -570,9 +566,9 @@ public void Example_GetTestFile_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTestFile_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = await client.GetTestFileAsync("<testId>", "<fileName>");
 
@@ -584,9 +580,9 @@ public async Task Example_GetTestFile_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTestFile_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = await client.GetTestFileAsync("<testId>", "<fileName>");
 
@@ -603,9 +599,9 @@ public async Task Example_GetTestFile_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTestFile()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = client.DeleteTestFile("<testId>", "<fileName>");
             Console.WriteLine(response.Status);
@@ -615,9 +611,9 @@ public void Example_DeleteTestFile()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTestFile_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = client.DeleteTestFile("<testId>", "<fileName>");
             Console.WriteLine(response.Status);
@@ -627,9 +623,9 @@ public void Example_DeleteTestFile_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTestFile_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = await client.DeleteTestFileAsync("<testId>", "<fileName>");
             Console.WriteLine(response.Status);
@@ -639,9 +635,9 @@ public async Task Example_DeleteTestFile_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTestFile_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = await client.DeleteTestFileAsync("<testId>", "<fileName>");
             Console.WriteLine(response.Status);
@@ -651,56 +647,54 @@ public async Task Example_DeleteTestFile_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateAppComponents()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                components = new
+                ["components"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdateAppComponents("<testId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateAppComponents("<testId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateAppComponents_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                components = new
+                ["components"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        resourceName = "<resourceName>",
-                        resourceType = "<resourceType>",
-                        displayName = "<displayName>",
-                        kind = "<kind>",
+                        ["resourceName"] = "<resourceName>",
+                        ["resourceType"] = "<resourceType>",
+                        ["displayName"] = "<displayName>",
+                        ["kind"] = "<kind>",
                     },
                 },
-            };
-
-            Response response = client.CreateOrUpdateAppComponents("<testId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateAppComponents("<testId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
             Console.WriteLine(result.GetProperty("testId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
@@ -712,56 +706,54 @@ public void Example_CreateOrUpdateAppComponents_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateAppComponents_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                components = new
+                ["components"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAppComponentsAsync("<testId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAppComponentsAsync("<testId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateAppComponents_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                components = new
+                ["components"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        resourceName = "<resourceName>",
-                        resourceType = "<resourceType>",
-                        displayName = "<displayName>",
-                        kind = "<kind>",
+                        ["resourceName"] = "<resourceName>",
+                        ["resourceType"] = "<resourceType>",
+                        ["displayName"] = "<displayName>",
+                        ["kind"] = "<kind>",
                     },
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAppComponentsAsync("<testId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAppComponentsAsync("<testId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
             Console.WriteLine(result.GetProperty("testId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
@@ -773,34 +765,34 @@ public async Task Example_CreateOrUpdateAppComponents_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAppComponents()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = client.GetAppComponents("<testId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAppComponents_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = client.GetAppComponents("<testId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
             Console.WriteLine(result.GetProperty("testId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
@@ -812,34 +804,34 @@ public void Example_GetAppComponents_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAppComponents_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = await client.GetAppComponentsAsync("<testId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAppComponents_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = await client.GetAppComponentsAsync("<testId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
             Console.WriteLine(result.GetProperty("testId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
@@ -851,13 +843,12 @@ public async Task Example_GetAppComponents_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateServerMetricsConfig()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            Response response = client.CreateOrUpdateServerMetricsConfig("<testId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdateServerMetricsConfig("<testId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -867,39 +858,38 @@ public void Example_CreateOrUpdateServerMetricsConfig()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateServerMetricsConfig_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                metrics = new
+                ["metrics"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        resourceId = "<resourceId>",
-                        metricNamespace = "<metricNamespace>",
-                        displayDescription = "<displayDescription>",
-                        name = "<name>",
-                        aggregation = "<aggregation>",
-                        unit = "<unit>",
-                        resourceType = "<resourceType>",
+                        ["resourceId"] = "<resourceId>",
+                        ["metricNamespace"] = "<metricNamespace>",
+                        ["displayDescription"] = "<displayDescription>",
+                        ["name"] = "<name>",
+                        ["aggregation"] = "<aggregation>",
+                        ["unit"] = "<unit>",
+                        ["resourceType"] = "<resourceType>",
                     },
                 },
-            };
-
-            Response response = client.CreateOrUpdateServerMetricsConfig("<testId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateServerMetricsConfig("<testId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("testId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
@@ -910,13 +900,12 @@ public void Example_CreateOrUpdateServerMetricsConfig_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateServerMetricsConfig_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -926,39 +915,38 @@ public async Task Example_CreateOrUpdateServerMetricsConfig_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateServerMetricsConfig_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                metrics = new
+                ["metrics"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        resourceId = "<resourceId>",
-                        metricNamespace = "<metricNamespace>",
-                        displayDescription = "<displayDescription>",
-                        name = "<name>",
-                        aggregation = "<aggregation>",
-                        unit = "<unit>",
-                        resourceType = "<resourceType>",
+                        ["resourceId"] = "<resourceId>",
+                        ["metricNamespace"] = "<metricNamespace>",
+                        ["displayDescription"] = "<displayDescription>",
+                        ["name"] = "<name>",
+                        ["aggregation"] = "<aggregation>",
+                        ["unit"] = "<unit>",
+                        ["resourceType"] = "<resourceType>",
                     },
                 },
-            };
-
-            Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("testId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
@@ -969,9 +957,9 @@ public async Task Example_CreateOrUpdateServerMetricsConfig_AllParameters_Async(
         [Ignore("Only validating compilation of examples")]
         public void Example_GetServerMetricsConfig()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = client.GetServerMetricsConfig("<testId>");
 
@@ -983,22 +971,22 @@ public void Example_GetServerMetricsConfig()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetServerMetricsConfig_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = client.GetServerMetricsConfig("<testId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("testId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
@@ -1009,9 +997,9 @@ public void Example_GetServerMetricsConfig_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetServerMetricsConfig_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = await client.GetServerMetricsConfigAsync("<testId>");
 
@@ -1023,22 +1011,22 @@ public async Task Example_GetServerMetricsConfig_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetServerMetricsConfig_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
             Response response = await client.GetServerMetricsConfigAsync("<testId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("testId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
@@ -1049,14 +1037,14 @@ public async Task Example_GetServerMetricsConfig_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTestFiles()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            foreach (var item in client.GetTestFiles("<testId>"))
+            foreach (BinaryData item in client.GetTestFiles("<testId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1064,19 +1052,19 @@ public void Example_GetTestFiles()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTestFiles_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            foreach (var item in client.GetTestFiles("<testId>"))
+            foreach (BinaryData item in client.GetTestFiles("<testId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("url").ToString());
-                Console.WriteLine(result.GetProperty("fileName").ToString());
-                Console.WriteLine(result.GetProperty("fileType").ToString());
-                Console.WriteLine(result.GetProperty("expireDateTime").ToString());
-                Console.WriteLine(result.GetProperty("validationStatus").ToString());
-                Console.WriteLine(result.GetProperty("validationFailureDetails").ToString());
+                Console.WriteLine(result[0].GetProperty("url").ToString());
+                Console.WriteLine(result[0].GetProperty("fileName").ToString());
+                Console.WriteLine(result[0].GetProperty("fileType").ToString());
+                Console.WriteLine(result[0].GetProperty("expireDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("validationStatus").ToString());
+                Console.WriteLine(result[0].GetProperty("validationFailureDetails").ToString());
             }
         }
 
@@ -1084,14 +1072,14 @@ public void Example_GetTestFiles_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTestFiles_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            await foreach (var item in client.GetTestFilesAsync("<testId>"))
+            await foreach (BinaryData item in client.GetTestFilesAsync("<testId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1099,19 +1087,19 @@ public async Task Example_GetTestFiles_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTestFiles_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestAdministrationClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestAdministrationClient client = new LoadTestAdministrationClient(endpoint, credential);
 
-            await foreach (var item in client.GetTestFilesAsync("<testId>"))
+            await foreach (BinaryData item in client.GetTestFilesAsync("<testId>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("url").ToString());
-                Console.WriteLine(result.GetProperty("fileName").ToString());
-                Console.WriteLine(result.GetProperty("fileType").ToString());
-                Console.WriteLine(result.GetProperty("expireDateTime").ToString());
-                Console.WriteLine(result.GetProperty("validationStatus").ToString());
-                Console.WriteLine(result.GetProperty("validationFailureDetails").ToString());
+                Console.WriteLine(result[0].GetProperty("url").ToString());
+                Console.WriteLine(result[0].GetProperty("fileName").ToString());
+                Console.WriteLine(result[0].GetProperty("fileType").ToString());
+                Console.WriteLine(result[0].GetProperty("expireDateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("validationStatus").ToString());
+                Console.WriteLine(result[0].GetProperty("validationFailureDetails").ToString());
             }
         }
     }
diff --git a/sdk/loadtestservice/Azure.Developer.LoadTesting/tests/Generated/Samples/Samples_LoadTestRunClient.cs b/sdk/loadtestservice/Azure.Developer.LoadTesting/tests/Generated/Samples/Samples_LoadTestRunClient.cs
index 53f6e8a943fb..88f1db38d983 100644
--- a/sdk/loadtestservice/Azure.Developer.LoadTesting/tests/Generated/Samples/Samples_LoadTestRunClient.cs
+++ b/sdk/loadtestservice/Azure.Developer.LoadTesting/tests/Generated/Samples/Samples_LoadTestRunClient.cs
@@ -7,11 +7,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
+using Azure.Developer.LoadTesting;
 using Azure.Identity;
 using NUnit.Framework;
 
@@ -23,9 +23,9 @@ public class Samples_LoadTestRunClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTestRun()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.GetTestRun("<testRunId>");
 
@@ -37,42 +37,42 @@ public void Example_GetTestRun()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTestRun_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.GetTestRun("<testRunId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errorDetails")[0].GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("transaction").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sampleCount").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorCount").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorPct").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("meanResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("medianResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("maxResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("minResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct1ResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct2ResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct3ResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("throughput").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("receivedKBytesPerSec").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sentKBytesPerSec").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("transaction").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sampleCount").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorCount").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorPct").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("meanResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("medianResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("maxResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("minResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct1ResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct2ResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct3ResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("throughput").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("receivedKBytesPerSec").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sentKBytesPerSec").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -145,9 +145,9 @@ public void Example_GetTestRun_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTestRun_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.GetTestRunAsync("<testRunId>");
 
@@ -159,42 +159,42 @@ public async Task Example_GetTestRun_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTestRun_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.GetTestRunAsync("<testRunId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errorDetails")[0].GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("transaction").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sampleCount").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorCount").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorPct").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("meanResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("medianResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("maxResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("minResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct1ResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct2ResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct3ResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("throughput").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("receivedKBytesPerSec").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sentKBytesPerSec").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("transaction").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sampleCount").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorCount").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorPct").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("meanResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("medianResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("maxResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("minResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct1ResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct2ResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct3ResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("throughput").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("receivedKBytesPerSec").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sentKBytesPerSec").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -267,9 +267,9 @@ public async Task Example_GetTestRun_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTestRun()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.DeleteTestRun("<testRunId>");
             Console.WriteLine(response.Status);
@@ -279,9 +279,9 @@ public void Example_DeleteTestRun()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTestRun_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.DeleteTestRun("<testRunId>");
             Console.WriteLine(response.Status);
@@ -291,9 +291,9 @@ public void Example_DeleteTestRun_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTestRun_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.DeleteTestRunAsync("<testRunId>");
             Console.WriteLine(response.Status);
@@ -303,9 +303,9 @@ public async Task Example_DeleteTestRun_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTestRun_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.DeleteTestRunAsync("<testRunId>");
             Console.WriteLine(response.Status);
@@ -315,9 +315,9 @@ public async Task Example_DeleteTestRun_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTestRunFile()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.GetTestRunFile("<testRunId>", "<fileName>");
 
@@ -329,9 +329,9 @@ public void Example_GetTestRunFile()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTestRunFile_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.GetTestRunFile("<testRunId>", "<fileName>");
 
@@ -348,9 +348,9 @@ public void Example_GetTestRunFile_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTestRunFile_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.GetTestRunFileAsync("<testRunId>", "<fileName>");
 
@@ -362,9 +362,9 @@ public async Task Example_GetTestRunFile_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTestRunFile_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.GetTestRunFileAsync("<testRunId>", "<fileName>");
 
@@ -381,9 +381,9 @@ public async Task Example_GetTestRunFile_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_StopTestRun()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.StopTestRun("<testRunId>");
 
@@ -395,42 +395,42 @@ public void Example_StopTestRun()
         [Ignore("Only validating compilation of examples")]
         public void Example_StopTestRun_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.StopTestRun("<testRunId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errorDetails")[0].GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("transaction").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sampleCount").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorCount").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorPct").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("meanResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("medianResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("maxResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("minResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct1ResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct2ResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct3ResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("throughput").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("receivedKBytesPerSec").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sentKBytesPerSec").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("transaction").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sampleCount").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorCount").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorPct").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("meanResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("medianResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("maxResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("minResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct1ResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct2ResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct3ResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("throughput").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("receivedKBytesPerSec").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sentKBytesPerSec").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -503,9 +503,9 @@ public void Example_StopTestRun_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_StopTestRun_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.StopTestRunAsync("<testRunId>");
 
@@ -517,42 +517,42 @@ public async Task Example_StopTestRun_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_StopTestRun_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.StopTestRunAsync("<testRunId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("clientMetric").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("aggregate").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("condition").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("requestName").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("action").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("actualValue").ToString());
-            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<test>").GetProperty("result").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("value").ToString());
-            Console.WriteLine(result.GetProperty("secrets").GetProperty("<test>").GetProperty("type").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("clientMetric").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("aggregate").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("condition").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("requestName").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("action").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("actualValue").ToString());
+            Console.WriteLine(result.GetProperty("passFailCriteria").GetProperty("passFailMetrics").GetProperty("<key>").GetProperty("result").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("value").ToString());
+            Console.WriteLine(result.GetProperty("secrets").GetProperty("<key>").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("certificate").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("environmentVariables").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("errorDetails")[0].GetProperty("message").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("transaction").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sampleCount").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorCount").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("errorPct").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("meanResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("medianResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("maxResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("minResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct1ResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct2ResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("pct3ResTime").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("throughput").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("receivedKBytesPerSec").ToString());
-            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<test>").GetProperty("sentKBytesPerSec").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("transaction").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sampleCount").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorCount").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("errorPct").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("meanResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("medianResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("maxResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("minResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct1ResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct2ResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("pct3ResTime").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("throughput").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("receivedKBytesPerSec").ToString());
+            Console.WriteLine(result.GetProperty("testRunStatistics").GetProperty("<key>").GetProperty("sentKBytesPerSec").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("engineInstances").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("splitAllCSVs").ToString());
             Console.WriteLine(result.GetProperty("loadTestConfiguration").GetProperty("quickStartTest").ToString());
@@ -625,9 +625,9 @@ public async Task Example_StopTestRun_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMetricNamespaces()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.GetMetricNamespaces("<testRunId>");
 
@@ -639,9 +639,9 @@ public void Example_GetMetricNamespaces()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMetricNamespaces_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.GetMetricNamespaces("<testRunId>");
 
@@ -654,9 +654,9 @@ public void Example_GetMetricNamespaces_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMetricNamespaces_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.GetMetricNamespacesAsync("<testRunId>");
 
@@ -668,9 +668,9 @@ public async Task Example_GetMetricNamespaces_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMetricNamespaces_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.GetMetricNamespacesAsync("<testRunId>");
 
@@ -683,9 +683,9 @@ public async Task Example_GetMetricNamespaces_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMetricDefinitions()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.GetMetricDefinitions("<testRunId>", "<metricNamespace>");
 
@@ -697,9 +697,9 @@ public void Example_GetMetricDefinitions()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMetricDefinitions_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.GetMetricDefinitions("<testRunId>", "<metricNamespace>");
 
@@ -719,9 +719,9 @@ public void Example_GetMetricDefinitions_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMetricDefinitions_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.GetMetricDefinitionsAsync("<testRunId>", "<metricNamespace>");
 
@@ -733,9 +733,9 @@ public async Task Example_GetMetricDefinitions_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMetricDefinitions_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.GetMetricDefinitionsAsync("<testRunId>", "<metricNamespace>");
 
@@ -755,56 +755,54 @@ public async Task Example_GetMetricDefinitions_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateAppComponents()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                components = new
+                ["components"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = client.CreateOrUpdateAppComponents("<testRunId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateAppComponents("<testRunId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateAppComponents_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                components = new
+                ["components"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        resourceName = "<resourceName>",
-                        resourceType = "<resourceType>",
-                        displayName = "<displayName>",
-                        kind = "<kind>",
+                        ["resourceName"] = "<resourceName>",
+                        ["resourceType"] = "<resourceType>",
+                        ["displayName"] = "<displayName>",
+                        ["kind"] = "<kind>",
                     },
                 },
-            };
-
-            Response response = client.CreateOrUpdateAppComponents("<testRunId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateAppComponents("<testRunId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
             Console.WriteLine(result.GetProperty("testRunId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
@@ -816,56 +814,54 @@ public void Example_CreateOrUpdateAppComponents_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateAppComponents_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                components = new
+                ["components"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAppComponentsAsync("<testRunId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAppComponentsAsync("<testRunId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateAppComponents_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                components = new
+                ["components"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        resourceName = "<resourceName>",
-                        resourceType = "<resourceType>",
-                        displayName = "<displayName>",
-                        kind = "<kind>",
+                        ["resourceName"] = "<resourceName>",
+                        ["resourceType"] = "<resourceType>",
+                        ["displayName"] = "<displayName>",
+                        ["kind"] = "<kind>",
                     },
                 },
-            };
-
-            Response response = await client.CreateOrUpdateAppComponentsAsync("<testRunId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAppComponentsAsync("<testRunId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
             Console.WriteLine(result.GetProperty("testRunId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
@@ -877,34 +873,34 @@ public async Task Example_CreateOrUpdateAppComponents_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAppComponents()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.GetAppComponents("<testRunId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAppComponents_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.GetAppComponents("<testRunId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
             Console.WriteLine(result.GetProperty("testRunId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
@@ -916,34 +912,34 @@ public void Example_GetAppComponents_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAppComponents_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.GetAppComponentsAsync("<testRunId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAppComponents_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.GetAppComponentsAsync("<testRunId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceType").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("displayName").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("resourceGroup").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("subscriptionId").ToString());
-            Console.WriteLine(result.GetProperty("components").GetProperty("<test>").GetProperty("kind").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("displayName").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("resourceGroup").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("subscriptionId").ToString());
+            Console.WriteLine(result.GetProperty("components").GetProperty("<key>").GetProperty("kind").ToString());
             Console.WriteLine(result.GetProperty("testRunId").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
@@ -955,13 +951,12 @@ public async Task Example_GetAppComponents_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateServerMetricsConfig()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            Response response = client.CreateOrUpdateServerMetricsConfig("<testRunId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdateServerMetricsConfig("<testRunId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -971,39 +966,38 @@ public void Example_CreateOrUpdateServerMetricsConfig()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateServerMetricsConfig_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                metrics = new
+                ["metrics"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        resourceId = "<resourceId>",
-                        metricNamespace = "<metricNamespace>",
-                        displayDescription = "<displayDescription>",
-                        name = "<name>",
-                        aggregation = "<aggregation>",
-                        unit = "<unit>",
-                        resourceType = "<resourceType>",
+                        ["resourceId"] = "<resourceId>",
+                        ["metricNamespace"] = "<metricNamespace>",
+                        ["displayDescription"] = "<displayDescription>",
+                        ["name"] = "<name>",
+                        ["aggregation"] = "<aggregation>",
+                        ["unit"] = "<unit>",
+                        ["resourceType"] = "<resourceType>",
                     },
                 },
-            };
-
-            Response response = client.CreateOrUpdateServerMetricsConfig("<testRunId>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateServerMetricsConfig("<testRunId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("testRunId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
@@ -1014,13 +1008,12 @@ public void Example_CreateOrUpdateServerMetricsConfig_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateServerMetricsConfig_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testRunId>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testRunId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1030,39 +1023,38 @@ public async Task Example_CreateOrUpdateServerMetricsConfig_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateServerMetricsConfig_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                metrics = new
+                ["metrics"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        resourceId = "<resourceId>",
-                        metricNamespace = "<metricNamespace>",
-                        displayDescription = "<displayDescription>",
-                        name = "<name>",
-                        aggregation = "<aggregation>",
-                        unit = "<unit>",
-                        resourceType = "<resourceType>",
+                        ["resourceId"] = "<resourceId>",
+                        ["metricNamespace"] = "<metricNamespace>",
+                        ["displayDescription"] = "<displayDescription>",
+                        ["name"] = "<name>",
+                        ["aggregation"] = "<aggregation>",
+                        ["unit"] = "<unit>",
+                        ["resourceType"] = "<resourceType>",
                     },
                 },
-            };
-
-            Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testRunId>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateServerMetricsConfigAsync("<testRunId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("testRunId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
@@ -1073,9 +1065,9 @@ public async Task Example_CreateOrUpdateServerMetricsConfig_AllParameters_Async(
         [Ignore("Only validating compilation of examples")]
         public void Example_GetServerMetricsConfig()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.GetServerMetricsConfig("<testRunId>");
 
@@ -1087,22 +1079,22 @@ public void Example_GetServerMetricsConfig()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetServerMetricsConfig_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = client.GetServerMetricsConfig("<testRunId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("testRunId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
@@ -1113,9 +1105,9 @@ public void Example_GetServerMetricsConfig_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetServerMetricsConfig_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.GetServerMetricsConfigAsync("<testRunId>");
 
@@ -1127,22 +1119,22 @@ public async Task Example_GetServerMetricsConfig_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetServerMetricsConfig_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
             Response response = await client.GetServerMetricsConfigAsync("<testRunId>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("testRunId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceId").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("metricNamespace").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("displayDescription").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("aggregation").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("unit").ToString());
-            Console.WriteLine(result.GetProperty("metrics").GetProperty("<test>").GetProperty("resourceType").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceId").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("metricNamespace").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("displayDescription").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("name").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("aggregation").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("unit").ToString());
+            Console.WriteLine(result.GetProperty("metrics").GetProperty("<key>").GetProperty("resourceType").ToString());
             Console.WriteLine(result.GetProperty("createdDateTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString());
@@ -1153,16 +1145,15 @@ public async Task Example_GetServerMetricsConfig_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMetrics()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            foreach (var item in client.GetMetrics("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", RequestContent.Create(data)))
+            RequestContent content = null;
+            foreach (BinaryData item in client.GetMetrics("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", content))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1170,29 +1161,31 @@ public void Example_GetMetrics()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMetrics_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                filters = new[] {
-        new {
-            name = "<name>",
-            values = new[] {
-                "<String>"
-            },
-        }
-    },
-            };
-
-            foreach (var item in client.GetMetrics("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", RequestContent.Create(data), "<aggregation>", "<interval>"))
+                ["filters"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["values"] = new List<object>()
+{
+"<values>"
+},
+}
+},
+            });
+            foreach (BinaryData item in client.GetMetrics("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", content, aggregation: "<aggregation>", interval: "PT5S"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("data")[0].GetProperty("timestamp").ToString());
-                Console.WriteLine(result.GetProperty("data")[0].GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("dimensionValues")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("dimensionValues")[0].GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("data")[0].GetProperty("timestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("data")[0].GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("dimensionValues")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("dimensionValues")[0].GetProperty("value").ToString());
             }
         }
 
@@ -1200,16 +1193,15 @@ public void Example_GetMetrics_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMetrics_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            await foreach (var item in client.GetMetricsAsync("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", RequestContent.Create(data)))
+            RequestContent content = null;
+            await foreach (BinaryData item in client.GetMetricsAsync("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", content))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1217,29 +1209,31 @@ public async Task Example_GetMetrics_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMetrics_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                filters = new[] {
-        new {
-            name = "<name>",
-            values = new[] {
-                "<String>"
-            },
-        }
-    },
-            };
-
-            await foreach (var item in client.GetMetricsAsync("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", RequestContent.Create(data), "<aggregation>", "<interval>"))
+                ["filters"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["name"] = "<name>",
+["values"] = new List<object>()
+{
+"<values>"
+},
+}
+},
+            });
+            await foreach (BinaryData item in client.GetMetricsAsync("<testRunId>", "<metricname>", "<metricNamespace>", "<timespan>", content, aggregation: "<aggregation>", interval: "PT5S"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("data")[0].GetProperty("timestamp").ToString());
-                Console.WriteLine(result.GetProperty("data")[0].GetProperty("value").ToString());
-                Console.WriteLine(result.GetProperty("dimensionValues")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("dimensionValues")[0].GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("data")[0].GetProperty("timestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("data")[0].GetProperty("value").ToString());
+                Console.WriteLine(result[0].GetProperty("dimensionValues")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("dimensionValues")[0].GetProperty("value").ToString());
             }
         }
 
@@ -1247,14 +1241,14 @@ public async Task Example_GetMetrics_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMetricDimensionValues()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            foreach (var item in client.GetMetricDimensionValues("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>"))
+            foreach (BinaryData item in client.GetMetricDimensionValues("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1262,14 +1256,14 @@ public void Example_GetMetricDimensionValues()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMetricDimensionValues_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            foreach (var item in client.GetMetricDimensionValues("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>", "<interval>"))
+            foreach (BinaryData item in client.GetMetricDimensionValues("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>", interval: "PT5S"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1277,14 +1271,14 @@ public void Example_GetMetricDimensionValues_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMetricDimensionValues_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            await foreach (var item in client.GetMetricDimensionValuesAsync("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>"))
+            await foreach (BinaryData item in client.GetMetricDimensionValuesAsync("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1292,14 +1286,14 @@ public async Task Example_GetMetricDimensionValues_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMetricDimensionValues_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LoadTestRunClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LoadTestRunClient client = new LoadTestRunClient(endpoint, credential);
 
-            await foreach (var item in client.GetMetricDimensionValuesAsync("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>", "<interval>"))
+            await foreach (BinaryData item in client.GetMetricDimensionValuesAsync("<testRunId>", "<name>", "<metricName>", "<metricNamespace>", "<timeInterval>", interval: "PT5S"))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
     }
diff --git a/sdk/monitor/Azure.Monitor.Ingestion/src/Generated/Docs/LogsIngestionClient.xml b/sdk/monitor/Azure.Monitor.Ingestion/src/Generated/Docs/LogsIngestionClient.xml
index a4cc5a13fbd5..cef088512d39 100644
--- a/sdk/monitor/Azure.Monitor.Ingestion/src/Generated/Docs/LogsIngestionClient.xml
+++ b/sdk/monitor/Azure.Monitor.Ingestion/src/Generated/Docs/LogsIngestionClient.xml
@@ -2,64 +2,62 @@
 <doc>
   <members>
     <member name="UploadAsync(string,string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call UploadAsync with required parameters and request content.
+      <example>
+This sample shows how to call UploadAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LogsIngestionClient(endpoint, credential);
-
-var data = new[] {
-    new {}
-};
-
-Response response = await client.UploadAsync("<ruleId>", "<streamName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LogsIngestionClient client = new LogsIngestionClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = await client.UploadAsync("<ruleId>", "<streamName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call UploadAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LogsIngestionClient(endpoint, credential);
-
-var data = new[] {
-    new {}
-};
-
-Response response = await client.UploadAsync("<ruleId>", "<streamName>", RequestContent.Create(data), "<contentEncoding>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LogsIngestionClient client = new LogsIngestionClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = await client.UploadAsync("<ruleId>", "<streamName>", content, contentEncoding: "<contentEncoding>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="Upload(string,string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call Upload with required parameters and request content.
+      <example>
+This sample shows how to call Upload.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LogsIngestionClient(endpoint, credential);
-
-var data = new[] {
-    new {}
-};
-
-Response response = client.Upload("<ruleId>", "<streamName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LogsIngestionClient client = new LogsIngestionClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = client.Upload("<ruleId>", "<streamName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call Upload with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new LogsIngestionClient(endpoint, credential);
-
-var data = new[] {
-    new {}
-};
-
-Response response = client.Upload("<ruleId>", "<streamName>", RequestContent.Create(data), "<contentEncoding>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+LogsIngestionClient client = new LogsIngestionClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = client.Upload("<ruleId>", "<streamName>", content, contentEncoding: "<contentEncoding>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/monitor/Azure.Monitor.Ingestion/tests/Generated/Samples/Samples_LogsIngestionClient.cs b/sdk/monitor/Azure.Monitor.Ingestion/tests/Generated/Samples/Samples_LogsIngestionClient.cs
index b0e0139c4b8f..87d799ecd305 100644
--- a/sdk/monitor/Azure.Monitor.Ingestion/tests/Generated/Samples/Samples_LogsIngestionClient.cs
+++ b/sdk/monitor/Azure.Monitor.Ingestion/tests/Generated/Samples/Samples_LogsIngestionClient.cs
@@ -7,12 +7,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Monitor.Ingestion;
 using NUnit.Framework;
 
 namespace Azure.Monitor.Ingestion.Samples
@@ -23,15 +22,15 @@ public class Samples_LogsIngestionClient
         [Ignore("Only validating compilation of examples")]
         public void Example_Upload()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LogsIngestionClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LogsIngestionClient client = new LogsIngestionClient(endpoint, credential);
 
-            var data = new[] {
-    new {}
-};
-
-            Response response = client.Upload("<ruleId>", "<streamName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = client.Upload("<ruleId>", "<streamName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -39,15 +38,15 @@ public void Example_Upload()
         [Ignore("Only validating compilation of examples")]
         public void Example_Upload_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LogsIngestionClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LogsIngestionClient client = new LogsIngestionClient(endpoint, credential);
 
-            var data = new[] {
-    new {}
-};
-
-            Response response = client.Upload("<ruleId>", "<streamName>", RequestContent.Create(data), "<contentEncoding>");
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = client.Upload("<ruleId>", "<streamName>", content, contentEncoding: "<contentEncoding>");
             Console.WriteLine(response.Status);
         }
 
@@ -55,15 +54,15 @@ public void Example_Upload_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Upload_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LogsIngestionClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LogsIngestionClient client = new LogsIngestionClient(endpoint, credential);
 
-            var data = new[] {
-    new {}
-};
-
-            Response response = await client.UploadAsync("<ruleId>", "<streamName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = await client.UploadAsync("<ruleId>", "<streamName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -71,15 +70,15 @@ public async Task Example_Upload_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Upload_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new LogsIngestionClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            LogsIngestionClient client = new LogsIngestionClient(endpoint, credential);
 
-            var data = new[] {
-    new {}
-};
-
-            Response response = await client.UploadAsync("<ruleId>", "<streamName>", RequestContent.Create(data), "<contentEncoding>");
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = await client.UploadAsync("<ruleId>", "<streamName>", content, contentEncoding: "<contentEncoding>");
             Console.WriteLine(response.Status);
         }
     }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Docs/OpenAIClient.xml b/sdk/openai/Azure.AI.OpenAI/src/Generated/Docs/OpenAIClient.xml
index 5e9ad80022d6..da1d5e0cd4c3 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/Docs/OpenAIClient.xml
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Docs/OpenAIClient.xml
@@ -1,131 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <doc>
   <members>
-    <member name="GetEmbeddingsAsync(string,EmbeddingsOptions,CancellationToken)">
-<example>
-This sample shows how to call GetEmbeddingsAsync with required parameters.
-<code><![CDATA[
-var client = new OpenAIClient("<openAIApiKey>");
-
-var embeddingsOptions = new EmbeddingsOptions(new string[] 
-{
-    "<null>"
-})
-{
-    User = "<User>",
-};
-var result = await client.GetEmbeddingsAsync("<deploymentId>", embeddingsOptions);
-]]></code>
-</example>
-    </member>
-    <member name="GetEmbeddings(string,EmbeddingsOptions,CancellationToken)">
-<example>
-This sample shows how to call GetEmbeddings with required parameters.
-<code><![CDATA[
-var client = new OpenAIClient("<openAIApiKey>");
-
-var embeddingsOptions = new EmbeddingsOptions(new string[] 
-{
-    "<null>"
-})
-{
-    User = "<User>",
-};
-var result = client.GetEmbeddings("<deploymentId>", embeddingsOptions);
-]]></code>
-</example>
-    </member>
-    <member name="GetEmbeddingsAsync(string,RequestContent,RequestContext)">
-    </member>
-    <member name="GetEmbeddings(string,RequestContent,RequestContext)">
-    </member>
-    <member name="GetCompletionsAsync(string,CompletionsOptions,CancellationToken)">
-<example>
-This sample shows how to call GetCompletionsAsync with required parameters.
-<code><![CDATA[
-var client = new OpenAIClient("<openAIApiKey>");
-
-var completionsOptions = new CompletionsOptions(new string[] 
-{
-    "<null>"
-})
-{
-    MaxTokens = 1234,
-    Temperature = 3.14f,
-    NucleusSamplingFactor = 3.14f,
-    User = "<User>",
-    ChoicesPerPrompt = 1234,
-    LogProbabilityCount = 1234,
-    Echo = true,
-    StopSequences = 
-{
-        "<null>"
-    },
-    PresencePenalty = 3.14f,
-    FrequencyPenalty = 3.14f,
-    GenerationSampleCount = 1234,
-};
-var result = await client.GetCompletionsAsync("<deploymentId>", completionsOptions);
-]]></code>
-</example>
-    </member>
-    <member name="GetCompletions(string,CompletionsOptions,CancellationToken)">
-<example>
-This sample shows how to call GetCompletions with required parameters.
-<code><![CDATA[
-var client = new OpenAIClient("<openAIApiKey>");
-
-var completionsOptions = new CompletionsOptions(new string[] 
-{
-    "<null>"
-})
-{
-    MaxTokens = 1234,
-    Temperature = 3.14f,
-    NucleusSamplingFactor = 3.14f,
-    User = "<User>",
-    ChoicesPerPrompt = 1234,
-    LogProbabilityCount = 1234,
-    Echo = true,
-    StopSequences = 
-{
-        "<null>"
-    },
-    PresencePenalty = 3.14f,
-    FrequencyPenalty = 3.14f,
-    GenerationSampleCount = 1234,
-};
-var result = client.GetCompletions("<deploymentId>", completionsOptions);
-]]></code>
-</example>
-    </member>
-    <member name="GetCompletionsAsync(string,RequestContent,RequestContext)">
-    </member>
-    <member name="GetCompletions(string,RequestContent,RequestContext)">
-    </member>
-    <member name="GetChatCompletionsAsync(string,ChatCompletionsOptions,CancellationToken)">
-    </member>
-    <member name="GetChatCompletions(string,ChatCompletionsOptions,CancellationToken)">
-    </member>
-    <member name="GetChatCompletionsAsync(string,RequestContent,RequestContext)">
-    </member>
-    <member name="GetChatCompletions(string,RequestContent,RequestContext)">
-    </member>
-    <member name="GetChatCompletionsWithAzureExtensionsAsync(string,ChatCompletionsOptions,CancellationToken)">
-    </member>
-    <member name="GetChatCompletionsWithAzureExtensions(string,ChatCompletionsOptions,CancellationToken)">
-    </member>
-    <member name="GetChatCompletionsWithAzureExtensionsAsync(string,RequestContent,RequestContext)">
-    </member>
-    <member name="GetChatCompletionsWithAzureExtensions(string,RequestContent,RequestContext)">
-    </member>
-    <member name="BeginAzureBatchImageGenerationAsync(WaitUntil,ImageGenerationOptions,CancellationToken)">
-    </member>
-    <member name="BeginAzureBatchImageGeneration(WaitUntil,ImageGenerationOptions,CancellationToken)">
-    </member>
-    <member name="BeginAzureBatchImageGenerationAsync(WaitUntil,RequestContent,RequestContext)">
-    </member>
-    <member name="BeginAzureBatchImageGeneration(WaitUntil,RequestContent,RequestContext)">
-    </member>
+    <member name="GetEmbeddingsAsync(string,EmbeddingsOptions,CancellationToken)" />
+    <member name="GetEmbeddings(string,EmbeddingsOptions,CancellationToken)" />
+    <member name="GetEmbeddingsAsync(string,RequestContent,RequestContext)" />
+    <member name="GetEmbeddings(string,RequestContent,RequestContext)" />
+    <member name="GetCompletionsAsync(string,CompletionsOptions,CancellationToken)" />
+    <member name="GetCompletions(string,CompletionsOptions,CancellationToken)" />
+    <member name="GetCompletionsAsync(string,RequestContent,RequestContext)" />
+    <member name="GetCompletions(string,RequestContent,RequestContext)" />
+    <member name="GetChatCompletionsAsync(string,ChatCompletionsOptions,CancellationToken)" />
+    <member name="GetChatCompletions(string,ChatCompletionsOptions,CancellationToken)" />
+    <member name="GetChatCompletionsAsync(string,RequestContent,RequestContext)" />
+    <member name="GetChatCompletions(string,RequestContent,RequestContext)" />
+    <member name="GetChatCompletionsWithAzureExtensionsAsync(string,ChatCompletionsOptions,CancellationToken)" />
+    <member name="GetChatCompletionsWithAzureExtensions(string,ChatCompletionsOptions,CancellationToken)" />
+    <member name="GetChatCompletionsWithAzureExtensionsAsync(string,RequestContent,RequestContext)" />
+    <member name="GetChatCompletionsWithAzureExtensions(string,RequestContent,RequestContext)" />
+    <member name="BeginAzureBatchImageGenerationAsync(WaitUntil,ImageGenerationOptions,CancellationToken)" />
+    <member name="BeginAzureBatchImageGeneration(WaitUntil,ImageGenerationOptions,CancellationToken)" />
+    <member name="BeginAzureBatchImageGenerationAsync(WaitUntil,RequestContent,RequestContext)" />
+    <member name="BeginAzureBatchImageGeneration(WaitUntil,RequestContent,RequestContext)" />
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/openai/Azure.AI.OpenAI/tests/Generated/Samples/Samples_OpenAIClient.cs b/sdk/openai/Azure.AI.OpenAI/tests/Generated/Samples/Samples_OpenAIClient.cs
index 461671ba7684..78a83161a2ad 100644
--- a/sdk/openai/Azure.AI.OpenAI/tests/Generated/Samples/Samples_OpenAIClient.cs
+++ b/sdk/openai/Azure.AI.OpenAI/tests/Generated/Samples/Samples_OpenAIClient.cs
@@ -5,63 +5,11 @@
 
 #nullable disable
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
-using System.Threading.Tasks;
-using Azure;
-using Azure.Core;
 using Azure.Identity;
-using NUnit.Framework;
 
 namespace Azure.AI.OpenAI.Samples
 {
     public class Samples_OpenAIClient
     {
-        [Test]
-        [Ignore("Only validating compilation of examples")]
-        public async Task Example_GetEmbeddings_Convenience_Async()
-        {
-            var client = new OpenAIClient("<openAIApiKey>");
-
-            var embeddingsOptions = new EmbeddingsOptions(new string[]
-            {
-    "<null>"
-            })
-            {
-                User = "<User>",
-            };
-            var result = await client.GetEmbeddingsAsync("<deploymentId>", embeddingsOptions);
-        }
-
-        [Test]
-        [Ignore("Only validating compilation of examples")]
-        public async Task Example_GetCompletions_Convenience_Async()
-        {
-            var client = new OpenAIClient("<openAIApiKey>");
-
-            var completionsOptions = new CompletionsOptions(new string[]
-            {
-    "<null>"
-            })
-            {
-                MaxTokens = 1234,
-                Temperature = 3.14f,
-                NucleusSamplingFactor = 3.14f,
-                User = "<User>",
-                ChoicesPerPrompt = 1234,
-                LogProbabilityCount = 1234,
-                Echo = true,
-                StopSequences =
-{
-        "<null>"
-    },
-                PresencePenalty = 3.14f,
-                FrequencyPenalty = 3.14f,
-                GenerationSampleCount = 1234,
-            };
-            var result = await client.GetCompletionsAsync("<deploymentId>", completionsOptions);
-        }
     }
 }
diff --git a/sdk/purview/Azure.Analytics.Purview.Account/src/Generated/Docs/PurviewAccountClient.xml b/sdk/purview/Azure.Analytics.Purview.Account/src/Generated/Docs/PurviewAccountClient.xml
index 1426615fbe14..7f35d5f27468 100644
--- a/sdk/purview/Azure.Analytics.Purview.Account/src/Generated/Docs/PurviewAccountClient.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Account/src/Generated/Docs/PurviewAccountClient.xml
@@ -2,14 +2,25 @@
 <doc>
   <members>
     <member name="GetAccountPropertiesAsync(RequestContext)">
-<example>
-This sample shows how to call GetAccountPropertiesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAccountPropertiesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = await client.GetAccountPropertiesAsync(new RequestContext());
+Response response = await client.GetAccountPropertiesAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetAccountPropertiesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+Response response = await client.GetAccountPropertiesAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -48,20 +59,30 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAccountProperties(RequestContext)">
-<example>
-This sample shows how to call GetAccountProperties with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAccountProperties and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+Response response = client.GetAccountProperties(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetAccountProperties with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = client.GetAccountProperties(new RequestContext());
+Response response = client.GetAccountProperties(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -100,37 +121,35 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateAccountPropertiesAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call UpdateAccountPropertiesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-var data = new {};
-
-Response response = await client.UpdateAccountPropertiesAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.UpdateAccountPropertiesAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateAccountPropertiesAsync with all request content, and how to parse the result.
+This sample shows how to call UpdateAccountPropertiesAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
-
-var data = new {
-    friendlyName = "<friendlyName>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = await client.UpdateAccountPropertiesAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["friendlyName"] = "<friendlyName>",
+});
+Response response = await client.UpdateAccountPropertiesAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -169,37 +188,35 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateAccountProperties(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call UpdateAccountProperties and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-var data = new {};
-
-Response response = client.UpdateAccountProperties(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.UpdateAccountProperties(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateAccountProperties with all request content, and how to parse the result.
+This sample shows how to call UpdateAccountProperties with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
-
-var data = new {
-    friendlyName = "<friendlyName>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = client.UpdateAccountProperties(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["friendlyName"] = "<friendlyName>",
+});
+Response response = client.UpdateAccountProperties(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -238,362 +255,421 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAccessKeysAsync(RequestContext)">
-<example>
-This sample shows how to call GetAccessKeysAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAccessKeysAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+Response response = await client.GetAccessKeysAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetAccessKeysAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = await client.GetAccessKeysAsync(new RequestContext());
+Response response = await client.GetAccessKeysAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
 Console.WriteLine(result.GetProperty("atlasKafkaSecondaryEndpoint").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAccessKeys(RequestContext)">
-<example>
-This sample shows how to call GetAccessKeys with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAccessKeys and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+Response response = client.GetAccessKeys(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetAccessKeys with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = client.GetAccessKeys(new RequestContext());
+Response response = client.GetAccessKeys(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
 Console.WriteLine(result.GetProperty("atlasKafkaSecondaryEndpoint").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RegenerateAccessKeyAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call RegenerateAccessKeyAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-var data = new {};
-
-Response response = await client.RegenerateAccessKeyAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.RegenerateAccessKeyAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call RegenerateAccessKeyAsync with all request content, and how to parse the result.
+This sample shows how to call RegenerateAccessKeyAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
-
-var data = new {
-    keyType = "PrimaryAtlasKafkaKey",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = await client.RegenerateAccessKeyAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["keyType"] = "PrimaryAtlasKafkaKey",
+});
+Response response = await client.RegenerateAccessKeyAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
 Console.WriteLine(result.GetProperty("atlasKafkaSecondaryEndpoint").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RegenerateAccessKey(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call RegenerateAccessKey and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-var data = new {};
-
-Response response = client.RegenerateAccessKey(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.RegenerateAccessKey(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call RegenerateAccessKey with all request content, and how to parse the result.
+This sample shows how to call RegenerateAccessKey with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
-
-var data = new {
-    keyType = "PrimaryAtlasKafkaKey",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = client.RegenerateAccessKey(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["keyType"] = "PrimaryAtlasKafkaKey",
+});
+Response response = client.RegenerateAccessKey(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
 Console.WriteLine(result.GetProperty("atlasKafkaSecondaryEndpoint").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCollectionsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCollectionsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCollectionsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-await foreach (var item in client.GetCollectionsAsync("<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetCollectionsAsync(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("parentCollection").GetProperty("referenceName").ToString());
-    Console.WriteLine(result.GetProperty("parentCollection").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("createdAt").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetCollectionsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetCollectionsAsync("<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("collectionProvisioningState").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("referenceName").ToString());
+    Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdAt").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdByType").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetCollections(string,RequestContext)">
-<example>
-This sample shows how to call GetCollections with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCollections and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-foreach (var item in client.GetCollections("<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetCollections(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("parentCollection").GetProperty("referenceName").ToString());
-    Console.WriteLine(result.GetProperty("parentCollection").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("createdAt").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetCollections with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetCollections("<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("collectionProvisioningState").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("referenceName").ToString());
+    Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdAt").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdByType").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetResourceSetRulesAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetResourceSetRulesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetResourceSetRulesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-await foreach (var item in client.GetResourceSetRulesAsync("<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetResourceSetRulesAsync(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
-    Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetResourceSetRulesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetResourceSetRulesAsync("<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
+    Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("version").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetResourceSetRules(string,RequestContext)">
-<example>
-This sample shows how to call GetResourceSetRules with required parameters and parse the result.
+      <example>
+This sample shows how to call GetResourceSetRules and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-foreach (var item in client.GetResourceSetRules("<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetResourceSetRules(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
-    Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetResourceSetRules with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetResourceSetRules("<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
+    Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("version").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Account/src/Generated/Docs/PurviewCollection.xml b/sdk/purview/Azure.Analytics.Purview.Account/src/Generated/Docs/PurviewCollection.xml
index 74242221269f..49a11ca43bbb 100644
--- a/sdk/purview/Azure.Analytics.Purview.Account/src/Generated/Docs/PurviewCollection.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Account/src/Generated/Docs/PurviewCollection.xml
@@ -2,14 +2,25 @@
 <doc>
   <members>
     <member name="GetCollectionAsync(RequestContext)">
-<example>
-This sample shows how to call GetCollectionAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCollectionAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-Response response = await client.GetCollectionAsync(new RequestContext());
+Response response = await client.GetCollectionAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCollectionAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+Response response = await client.GetCollectionAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -24,18 +35,28 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCollection(RequestContext)">
-<example>
-This sample shows how to call GetCollection with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCollection and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-Response response = client.GetCollection(new RequestContext());
+Response response = client.GetCollection(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCollection with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+Response response = client.GetCollection(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -50,39 +71,38 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateCollectionAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateCollectionAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateCollectionAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateCollectionAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateCollectionAsync with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateCollectionAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-var data = new {
-    description = "<description>",
-    friendlyName = "<friendlyName>",
-    parentCollection = new {
-        referenceName = "<referenceName>",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["description"] = "<description>",
+    ["friendlyName"] = "<friendlyName>",
+    ["parentCollection"] = new Dictionary<string, object>()
+    {
+        ["referenceName"] = "<referenceName>",
     },
-};
-
-Response response = await client.CreateOrUpdateCollectionAsync(RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateCollectionAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -97,39 +117,38 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateCollection(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateCollection and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-var data = new {};
-
-Response response = client.CreateOrUpdateCollection(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdateCollection(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateCollection with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateCollection with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-var data = new {
-    description = "<description>",
-    friendlyName = "<friendlyName>",
-    parentCollection = new {
-        referenceName = "<referenceName>",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["description"] = "<description>",
+    ["friendlyName"] = "<friendlyName>",
+    ["parentCollection"] = new Dictionary<string, object>()
+    {
+        ["referenceName"] = "<referenceName>",
     },
-};
-
-Response response = client.CreateOrUpdateCollection(RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdateCollection(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -144,100 +163,157 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteCollectionAsync(RequestContext)">
-<example>
+      <example>
 This sample shows how to call DeleteCollectionAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
 Response response = await client.DeleteCollectionAsync();
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteCollectionAsync with all request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+Response response = await client.DeleteCollectionAsync();
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteCollection(RequestContext)">
-<example>
+      <example>
 This sample shows how to call DeleteCollection.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
 Response response = client.DeleteCollection();
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteCollection with all request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+Response response = client.DeleteCollection();
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetCollectionPathAsync(RequestContext)">
-<example>
-This sample shows how to call GetCollectionPathAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCollectionPathAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+Response response = await client.GetCollectionPathAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCollectionPathAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-Response response = await client.GetCollectionPathAsync(new RequestContext());
+Response response = await client.GetCollectionPathAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("parentFriendlyNameChain")[0].ToString());
 Console.WriteLine(result.GetProperty("parentNameChain")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCollectionPath(RequestContext)">
-<example>
-This sample shows how to call GetCollectionPath with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCollectionPath and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-Response response = client.GetCollectionPath(new RequestContext());
+Response response = client.GetCollectionPath(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCollectionPath with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+Response response = client.GetCollectionPath(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("parentFriendlyNameChain")[0].ToString());
 Console.WriteLine(result.GetProperty("parentNameChain")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetChildCollectionNamesAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetChildCollectionNamesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetChildCollectionNamesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-await foreach (var item in client.GetChildCollectionNamesAsync("<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetChildCollectionNamesAsync(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetChildCollectionNamesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+await foreach (BinaryData item in client.GetChildCollectionNamesAsync("<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetChildCollectionNames(string,RequestContext)">
-<example>
-This sample shows how to call GetChildCollectionNames with required parameters and parse the result.
+      <example>
+This sample shows how to call GetChildCollectionNames and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-foreach (var item in client.GetChildCollectionNames("<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetChildCollectionNames(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetChildCollectionNames with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+foreach (BinaryData item in client.GetChildCollectionNames("<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Account/src/Generated/Docs/PurviewResourceSetRule.xml b/sdk/purview/Azure.Analytics.Purview.Account/src/Generated/Docs/PurviewResourceSetRule.xml
index c41035842cca..c8aa9ca1f6db 100644
--- a/sdk/purview/Azure.Analytics.Purview.Account/src/Generated/Docs/PurviewResourceSetRule.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Account/src/Generated/Docs/PurviewResourceSetRule.xml
@@ -2,14 +2,25 @@
 <doc>
   <members>
     <member name="GetResourceSetRuleAsync(RequestContext)">
-<example>
-This sample shows how to call GetResourceSetRuleAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetResourceSetRuleAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-Response response = await client.GetResourceSetRuleAsync(new RequestContext());
+Response response = await client.GetResourceSetRuleAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetResourceSetRuleAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+
+Response response = await client.GetResourceSetRuleAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -97,18 +108,28 @@ Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRul
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetResourceSetRule(RequestContext)">
-<example>
-This sample shows how to call GetResourceSetRule with required parameters and parse the result.
+      <example>
+This sample shows how to call GetResourceSetRule and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-Response response = client.GetResourceSetRule(new RequestContext());
+Response response = client.GetResourceSetRule(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetResourceSetRule with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+
+Response response = client.GetResourceSetRule(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -196,158 +217,144 @@ Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRul
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateResourceSetRuleAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateResourceSetRuleAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateResourceSetRuleAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateResourceSetRuleAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateResourceSetRuleAsync with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateResourceSetRuleAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-var data = new {
-    advancedResourceSet = new {
-        modifiedAt = "2022-05-10T18:57:31.2311892Z",
-        resourceSetProcessing = "Default",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["advancedResourceSet"] = new Dictionary<string, object>()
+    {
+        ["modifiedAt"] = "2022-05-10T18:57:31.2311892Z",
+        ["resourceSetProcessing"] = "Default",
     },
-    pathPatternConfig = new {
-        acceptedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-        complexReplacers = new[] {
-            new {
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                typeName = "<typeName>",
-            }
-        },
-        createdBy = "<createdBy>",
-        enableDefaultPatterns = true,
-        lastUpdatedTimestamp = 1234L,
-        modifiedBy = "<modifiedBy>",
-        normalizationRules = new[] {
-            new {
-                description = "<description>",
-                disabled = true,
-                dynamicReplacement = true,
-                entityTypes = new[] {
-                    "<String>"
-                },
-                lastUpdatedTimestamp = 1234L,
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-                version = 123.45d,
-            }
-        },
-        regexReplacers = new[] {
-            new {
-                condition = "<condition>",
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                doNotReplaceRegex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-            }
-        },
-        rejectedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-        scopedRules = new[] {
-            new {
-                bindingUrl = "<bindingUrl>",
-                rules = new[] {
-                    new {
-                        displayName = "<displayName>",
-                        isResourceSet = true,
-                        lastUpdatedTimestamp = 1234L,
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                    }
-                },
-                storeType = "<storeType>",
-            }
-        },
-        version = 1234,
+    ["pathPatternConfig"] = new Dictionary<string, object>()
+    {
+        ["acceptedPatterns"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["filterType"] = "Pattern",
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["path"] = "<path>",
+}
+},
+        ["complexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["typeName"] = "<typeName>",
+}
+},
+        ["createdBy"] = "<createdBy>",
+        ["enableDefaultPatterns"] = true,
+        ["lastUpdatedTimestamp"] = 1234L,
+        ["modifiedBy"] = "<modifiedBy>",
+        ["normalizationRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["disabled"] = true,
+["dynamicReplacement"] = true,
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["regex"] = new Dictionary<string, object>()
+{
+["maxDigits"] = 1234,
+["maxLetters"] = 1234,
+["minDashes"] = 1234,
+["minDigits"] = 1234,
+["minDigitsOrLetters"] = 1234,
+["minDots"] = 1234,
+["minHex"] = 1234,
+["minLetters"] = 1234,
+["minUnderscores"] = 1234,
+["options"] = 1234,
+["regexStr"] = "<regexStr>",
+},
+["replaceWith"] = "<replaceWith>",
+["version"] = 123.45,
+}
+},
+        ["regexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["condition"] = "<condition>",
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["doNotReplaceRegex"] = null
+,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["regex"] = null
+,
+["replaceWith"] = "<replaceWith>",
+}
+},
+        ["rejectedPatterns"] = new List<object>()
+{
+null
+},
+        ["scopedRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["bindingUrl"] = "<bindingUrl>",
+["rules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["isResourceSet"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+}
+},
+["storeType"] = "<storeType>",
+}
+},
+        ["version"] = 1234,
     },
-};
-
-Response response = await client.CreateOrUpdateResourceSetRuleAsync(RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateResourceSetRuleAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -435,158 +442,144 @@ Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRul
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateResourceSetRule(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateResourceSetRule and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-Response response = client.CreateOrUpdateResourceSetRule(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdateResourceSetRule(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateResourceSetRule with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateResourceSetRule with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-var data = new {
-    advancedResourceSet = new {
-        modifiedAt = "2022-05-10T18:57:31.2311892Z",
-        resourceSetProcessing = "Default",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["advancedResourceSet"] = new Dictionary<string, object>()
+    {
+        ["modifiedAt"] = "2022-05-10T18:57:31.2311892Z",
+        ["resourceSetProcessing"] = "Default",
     },
-    pathPatternConfig = new {
-        acceptedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-        complexReplacers = new[] {
-            new {
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                typeName = "<typeName>",
-            }
-        },
-        createdBy = "<createdBy>",
-        enableDefaultPatterns = true,
-        lastUpdatedTimestamp = 1234L,
-        modifiedBy = "<modifiedBy>",
-        normalizationRules = new[] {
-            new {
-                description = "<description>",
-                disabled = true,
-                dynamicReplacement = true,
-                entityTypes = new[] {
-                    "<String>"
-                },
-                lastUpdatedTimestamp = 1234L,
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-                version = 123.45d,
-            }
-        },
-        regexReplacers = new[] {
-            new {
-                condition = "<condition>",
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                doNotReplaceRegex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-            }
-        },
-        rejectedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-        scopedRules = new[] {
-            new {
-                bindingUrl = "<bindingUrl>",
-                rules = new[] {
-                    new {
-                        displayName = "<displayName>",
-                        isResourceSet = true,
-                        lastUpdatedTimestamp = 1234L,
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                    }
-                },
-                storeType = "<storeType>",
-            }
-        },
-        version = 1234,
+    ["pathPatternConfig"] = new Dictionary<string, object>()
+    {
+        ["acceptedPatterns"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["filterType"] = "Pattern",
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["path"] = "<path>",
+}
+},
+        ["complexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["typeName"] = "<typeName>",
+}
+},
+        ["createdBy"] = "<createdBy>",
+        ["enableDefaultPatterns"] = true,
+        ["lastUpdatedTimestamp"] = 1234L,
+        ["modifiedBy"] = "<modifiedBy>",
+        ["normalizationRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["disabled"] = true,
+["dynamicReplacement"] = true,
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["regex"] = new Dictionary<string, object>()
+{
+["maxDigits"] = 1234,
+["maxLetters"] = 1234,
+["minDashes"] = 1234,
+["minDigits"] = 1234,
+["minDigitsOrLetters"] = 1234,
+["minDots"] = 1234,
+["minHex"] = 1234,
+["minLetters"] = 1234,
+["minUnderscores"] = 1234,
+["options"] = 1234,
+["regexStr"] = "<regexStr>",
+},
+["replaceWith"] = "<replaceWith>",
+["version"] = 123.45,
+}
+},
+        ["regexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["condition"] = "<condition>",
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["doNotReplaceRegex"] = null
+,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["regex"] = null
+,
+["replaceWith"] = "<replaceWith>",
+}
+},
+        ["rejectedPatterns"] = new List<object>()
+{
+null
+},
+        ["scopedRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["bindingUrl"] = "<bindingUrl>",
+["rules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["isResourceSet"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+}
+},
+["storeType"] = "<storeType>",
+}
+},
+        ["version"] = 1234,
     },
-};
-
-Response response = client.CreateOrUpdateResourceSetRule(RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdateResourceSetRule(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -674,34 +667,49 @@ Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRul
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteResourceSetRuleAsync(RequestContext)">
-<example>
+      <example>
 This sample shows how to call DeleteResourceSetRuleAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
 Response response = await client.DeleteResourceSetRuleAsync();
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteResourceSetRuleAsync with all request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+
+Response response = await client.DeleteResourceSetRuleAsync();
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteResourceSetRule(RequestContext)">
-<example>
+      <example>
 This sample shows how to call DeleteResourceSetRule.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
 Response response = client.DeleteResourceSetRule();
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteResourceSetRule with all request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+
+Response response = client.DeleteResourceSetRule();
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Account/tests/Generated/Samples/Samples_PurviewAccountClient.cs b/sdk/purview/Azure.Analytics.Purview.Account/tests/Generated/Samples/Samples_PurviewAccountClient.cs
index fbde2ce5c17e..5bace3695f81 100644
--- a/sdk/purview/Azure.Analytics.Purview.Account/tests/Generated/Samples/Samples_PurviewAccountClient.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Account/tests/Generated/Samples/Samples_PurviewAccountClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Account;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +23,11 @@ public class Samples_PurviewAccountClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAccountProperties()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = client.GetAccountProperties(new RequestContext());
+            Response response = client.GetAccountProperties(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -37,11 +37,11 @@ public void Example_GetAccountProperties()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAccountProperties_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = client.GetAccountProperties(new RequestContext());
+            Response response = client.GetAccountProperties(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -80,7 +80,7 @@ public void Example_GetAccountProperties_AllParameters()
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("type").ToString());
         }
 
@@ -88,11 +88,11 @@ public void Example_GetAccountProperties_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAccountProperties_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = await client.GetAccountPropertiesAsync(new RequestContext());
+            Response response = await client.GetAccountPropertiesAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -102,11 +102,11 @@ public async Task Example_GetAccountProperties_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAccountProperties_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = await client.GetAccountPropertiesAsync(new RequestContext());
+            Response response = await client.GetAccountPropertiesAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -145,7 +145,7 @@ public async Task Example_GetAccountProperties_AllParameters_Async()
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("type").ToString());
         }
 
@@ -153,13 +153,12 @@ public async Task Example_GetAccountProperties_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateAccountProperties()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = client.UpdateAccountProperties(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.UpdateAccountProperties(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -169,16 +168,15 @@ public void Example_UpdateAccountProperties()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateAccountProperties_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                friendlyName = "<friendlyName>",
-            };
-
-            Response response = client.UpdateAccountProperties(RequestContent.Create(data));
+                ["friendlyName"] = "<friendlyName>",
+            });
+            Response response = client.UpdateAccountProperties(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -217,7 +215,7 @@ public void Example_UpdateAccountProperties_AllParameters()
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("type").ToString());
         }
 
@@ -225,13 +223,12 @@ public void Example_UpdateAccountProperties_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateAccountProperties_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = await client.UpdateAccountPropertiesAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.UpdateAccountPropertiesAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -241,16 +238,15 @@ public async Task Example_UpdateAccountProperties_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateAccountProperties_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                friendlyName = "<friendlyName>",
-            };
-
-            Response response = await client.UpdateAccountPropertiesAsync(RequestContent.Create(data));
+                ["friendlyName"] = "<friendlyName>",
+            });
+            Response response = await client.UpdateAccountPropertiesAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -289,7 +285,7 @@ public async Task Example_UpdateAccountProperties_AllParameters_Async()
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("type").ToString());
         }
 
@@ -297,11 +293,11 @@ public async Task Example_UpdateAccountProperties_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAccessKeys()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = client.GetAccessKeys(new RequestContext());
+            Response response = client.GetAccessKeys(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -311,11 +307,11 @@ public void Example_GetAccessKeys()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAccessKeys_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = client.GetAccessKeys(new RequestContext());
+            Response response = client.GetAccessKeys(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
@@ -326,11 +322,11 @@ public void Example_GetAccessKeys_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAccessKeys_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = await client.GetAccessKeysAsync(new RequestContext());
+            Response response = await client.GetAccessKeysAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -340,11 +336,11 @@ public async Task Example_GetAccessKeys_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAccessKeys_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = await client.GetAccessKeysAsync(new RequestContext());
+            Response response = await client.GetAccessKeysAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
@@ -355,13 +351,12 @@ public async Task Example_GetAccessKeys_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_RegenerateAccessKey()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = client.RegenerateAccessKey(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.RegenerateAccessKey(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -371,16 +366,15 @@ public void Example_RegenerateAccessKey()
         [Ignore("Only validating compilation of examples")]
         public void Example_RegenerateAccessKey_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                keyType = "PrimaryAtlasKafkaKey",
-            };
-
-            Response response = client.RegenerateAccessKey(RequestContent.Create(data));
+                ["keyType"] = "PrimaryAtlasKafkaKey",
+            });
+            Response response = client.RegenerateAccessKey(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
@@ -391,13 +385,12 @@ public void Example_RegenerateAccessKey_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RegenerateAccessKey_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = await client.RegenerateAccessKeyAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.RegenerateAccessKeyAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -407,16 +400,15 @@ public async Task Example_RegenerateAccessKey_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RegenerateAccessKey_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                keyType = "PrimaryAtlasKafkaKey",
-            };
-
-            Response response = await client.RegenerateAccessKeyAsync(RequestContent.Create(data));
+                ["keyType"] = "PrimaryAtlasKafkaKey",
+            });
+            Response response = await client.RegenerateAccessKeyAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
@@ -427,14 +419,14 @@ public async Task Example_RegenerateAccessKey_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCollections()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            foreach (var item in client.GetCollections("<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetCollections(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -442,25 +434,25 @@ public void Example_GetCollections()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCollections_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            foreach (var item in client.GetCollections("<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetCollections("<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("parentCollection").GetProperty("referenceName").ToString());
-                Console.WriteLine(result.GetProperty("parentCollection").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("createdAt").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
+                Console.WriteLine(result[0].GetProperty("collectionProvisioningState").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("referenceName").ToString());
+                Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdAt").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdByType").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
             }
         }
 
@@ -468,14 +460,14 @@ public void Example_GetCollections_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCollections_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            await foreach (var item in client.GetCollectionsAsync("<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetCollectionsAsync(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -483,25 +475,25 @@ public async Task Example_GetCollections_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCollections_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            await foreach (var item in client.GetCollectionsAsync("<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetCollectionsAsync("<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("parentCollection").GetProperty("referenceName").ToString());
-                Console.WriteLine(result.GetProperty("parentCollection").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("createdAt").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
+                Console.WriteLine(result[0].GetProperty("collectionProvisioningState").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("referenceName").ToString());
+                Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdAt").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdByType").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
             }
         }
 
@@ -509,14 +501,14 @@ public async Task Example_GetCollections_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetResourceSetRules()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            foreach (var item in client.GetResourceSetRules("<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetResourceSetRules(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -524,98 +516,98 @@ public void Example_GetResourceSetRules()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetResourceSetRules_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            foreach (var item in client.GetResourceSetRules("<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetResourceSetRules("<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
-                Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
+                Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("version").ToString());
             }
         }
 
@@ -623,14 +615,14 @@ public void Example_GetResourceSetRules_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetResourceSetRules_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            await foreach (var item in client.GetResourceSetRulesAsync("<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetResourceSetRulesAsync(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -638,98 +630,98 @@ public async Task Example_GetResourceSetRules_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetResourceSetRules_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            await foreach (var item in client.GetResourceSetRulesAsync("<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetResourceSetRulesAsync("<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
-                Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
+                Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("version").ToString());
             }
         }
     }
diff --git a/sdk/purview/Azure.Analytics.Purview.Account/tests/Generated/Samples/Samples_PurviewCollection.cs b/sdk/purview/Azure.Analytics.Purview.Account/tests/Generated/Samples/Samples_PurviewCollection.cs
index 23ef85376125..5cf2fca23a00 100644
--- a/sdk/purview/Azure.Analytics.Purview.Account/tests/Generated/Samples/Samples_PurviewCollection.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Account/tests/Generated/Samples/Samples_PurviewCollection.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Account;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +23,11 @@ internal class Samples_PurviewCollection
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCollection()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = client.GetCollection(new RequestContext());
+            Response response = client.GetCollection(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -37,11 +37,11 @@ public void Example_GetCollection()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCollection_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = client.GetCollection(new RequestContext());
+            Response response = client.GetCollection(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -62,11 +62,11 @@ public void Example_GetCollection_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCollection_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = await client.GetCollectionAsync(new RequestContext());
+            Response response = await client.GetCollectionAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -76,11 +76,11 @@ public async Task Example_GetCollection_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCollection_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = await client.GetCollectionAsync(new RequestContext());
+            Response response = await client.GetCollectionAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -101,13 +101,12 @@ public async Task Example_GetCollection_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateCollection()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdateCollection(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdateCollection(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -117,21 +116,20 @@ public void Example_CreateOrUpdateCollection()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateCollection_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                description = "<description>",
-                friendlyName = "<friendlyName>",
-                parentCollection = new
+                ["description"] = "<description>",
+                ["friendlyName"] = "<friendlyName>",
+                ["parentCollection"] = new Dictionary<string, object>()
                 {
-                    referenceName = "<referenceName>",
+                    ["referenceName"] = "<referenceName>",
                 },
-            };
-
-            Response response = client.CreateOrUpdateCollection(RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateCollection(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -152,13 +150,12 @@ public void Example_CreateOrUpdateCollection_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateCollection_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateCollectionAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateCollectionAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -168,21 +165,20 @@ public async Task Example_CreateOrUpdateCollection_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateCollection_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                description = "<description>",
-                friendlyName = "<friendlyName>",
-                parentCollection = new
+                ["description"] = "<description>",
+                ["friendlyName"] = "<friendlyName>",
+                ["parentCollection"] = new Dictionary<string, object>()
                 {
-                    referenceName = "<referenceName>",
+                    ["referenceName"] = "<referenceName>",
                 },
-            };
-
-            Response response = await client.CreateOrUpdateCollectionAsync(RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateCollectionAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -203,9 +199,9 @@ public async Task Example_CreateOrUpdateCollection_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteCollection()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
             Response response = client.DeleteCollection();
             Console.WriteLine(response.Status);
@@ -215,9 +211,9 @@ public void Example_DeleteCollection()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteCollection_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
             Response response = client.DeleteCollection();
             Console.WriteLine(response.Status);
@@ -227,9 +223,9 @@ public void Example_DeleteCollection_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteCollection_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
             Response response = await client.DeleteCollectionAsync();
             Console.WriteLine(response.Status);
@@ -239,9 +235,9 @@ public async Task Example_DeleteCollection_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteCollection_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
             Response response = await client.DeleteCollectionAsync();
             Console.WriteLine(response.Status);
@@ -251,11 +247,11 @@ public async Task Example_DeleteCollection_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCollectionPath()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = client.GetCollectionPath(new RequestContext());
+            Response response = client.GetCollectionPath(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -265,11 +261,11 @@ public void Example_GetCollectionPath()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCollectionPath_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = client.GetCollectionPath(new RequestContext());
+            Response response = client.GetCollectionPath(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("parentFriendlyNameChain")[0].ToString());
@@ -280,11 +276,11 @@ public void Example_GetCollectionPath_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCollectionPath_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = await client.GetCollectionPathAsync(new RequestContext());
+            Response response = await client.GetCollectionPathAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -294,11 +290,11 @@ public async Task Example_GetCollectionPath_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCollectionPath_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = await client.GetCollectionPathAsync(new RequestContext());
+            Response response = await client.GetCollectionPathAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("parentFriendlyNameChain")[0].ToString());
@@ -309,14 +305,14 @@ public async Task Example_GetCollectionPath_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetChildCollectionNames()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            foreach (var item in client.GetChildCollectionNames("<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetChildCollectionNames(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -324,15 +320,15 @@ public void Example_GetChildCollectionNames()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetChildCollectionNames_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            foreach (var item in client.GetChildCollectionNames("<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetChildCollectionNames("<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -340,14 +336,14 @@ public void Example_GetChildCollectionNames_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetChildCollectionNames_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            await foreach (var item in client.GetChildCollectionNamesAsync("<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetChildCollectionNamesAsync(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -355,15 +351,15 @@ public async Task Example_GetChildCollectionNames_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetChildCollectionNames_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            await foreach (var item in client.GetChildCollectionNamesAsync("<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetChildCollectionNamesAsync("<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
     }
diff --git a/sdk/purview/Azure.Analytics.Purview.Account/tests/Generated/Samples/Samples_PurviewResourceSetRule.cs b/sdk/purview/Azure.Analytics.Purview.Account/tests/Generated/Samples/Samples_PurviewResourceSetRule.cs
index 0b2e722f27d9..bf2156db8a7f 100644
--- a/sdk/purview/Azure.Analytics.Purview.Account/tests/Generated/Samples/Samples_PurviewResourceSetRule.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Account/tests/Generated/Samples/Samples_PurviewResourceSetRule.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Account;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +23,11 @@ internal class Samples_PurviewResourceSetRule
         [Ignore("Only validating compilation of examples")]
         public void Example_GetResourceSetRule()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            Response response = client.GetResourceSetRule(new RequestContext());
+            Response response = client.GetResourceSetRule(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -37,11 +37,11 @@ public void Example_GetResourceSetRule()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetResourceSetRule_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            Response response = client.GetResourceSetRule(new RequestContext());
+            Response response = client.GetResourceSetRule(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -135,11 +135,11 @@ public void Example_GetResourceSetRule_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetResourceSetRule_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            Response response = await client.GetResourceSetRuleAsync(new RequestContext());
+            Response response = await client.GetResourceSetRuleAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -149,11 +149,11 @@ public async Task Example_GetResourceSetRule_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetResourceSetRule_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            Response response = await client.GetResourceSetRuleAsync(new RequestContext());
+            Response response = await client.GetResourceSetRuleAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -247,13 +247,12 @@ public async Task Example_GetResourceSetRule_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateResourceSetRule()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdateResourceSetRule(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdateResourceSetRule(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -263,141 +262,126 @@ public void Example_CreateOrUpdateResourceSetRule()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateResourceSetRule_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                advancedResourceSet = new
+                ["advancedResourceSet"] = new Dictionary<string, object>()
                 {
-                    modifiedAt = "2022-05-10T18:57:31.2311892Z",
-                    resourceSetProcessing = "Default",
+                    ["modifiedAt"] = "2022-05-10T18:57:31.2311892Z",
+                    ["resourceSetProcessing"] = "Default",
                 },
-                pathPatternConfig = new
+                ["pathPatternConfig"] = new Dictionary<string, object>()
                 {
-                    acceptedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-                    complexReplacers = new[] {
-            new {
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                typeName = "<typeName>",
-            }
-        },
-                    createdBy = "<createdBy>",
-                    enableDefaultPatterns = true,
-                    lastUpdatedTimestamp = 1234L,
-                    modifiedBy = "<modifiedBy>",
-                    normalizationRules = new[] {
-            new {
-                description = "<description>",
-                disabled = true,
-                dynamicReplacement = true,
-                entityTypes = new[] {
-                    "<String>"
-                },
-                lastUpdatedTimestamp = 1234L,
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-                version = 123.45d,
-            }
-        },
-                    regexReplacers = new[] {
-            new {
-                condition = "<condition>",
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                doNotReplaceRegex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-            }
-        },
-                    rejectedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-                    scopedRules = new[] {
-            new {
-                bindingUrl = "<bindingUrl>",
-                rules = new[] {
-                    new {
-                        displayName = "<displayName>",
-                        isResourceSet = true,
-                        lastUpdatedTimestamp = 1234L,
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                    }
-                },
-                storeType = "<storeType>",
-            }
-        },
-                    version = 1234,
+                    ["acceptedPatterns"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["filterType"] = "Pattern",
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["path"] = "<path>",
+}
+},
+                    ["complexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["typeName"] = "<typeName>",
+}
+},
+                    ["createdBy"] = "<createdBy>",
+                    ["enableDefaultPatterns"] = true,
+                    ["lastUpdatedTimestamp"] = 1234L,
+                    ["modifiedBy"] = "<modifiedBy>",
+                    ["normalizationRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["disabled"] = true,
+["dynamicReplacement"] = true,
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["regex"] = new Dictionary<string, object>()
+{
+["maxDigits"] = 1234,
+["maxLetters"] = 1234,
+["minDashes"] = 1234,
+["minDigits"] = 1234,
+["minDigitsOrLetters"] = 1234,
+["minDots"] = 1234,
+["minHex"] = 1234,
+["minLetters"] = 1234,
+["minUnderscores"] = 1234,
+["options"] = 1234,
+["regexStr"] = "<regexStr>",
+},
+["replaceWith"] = "<replaceWith>",
+["version"] = 123.45,
+}
+},
+                    ["regexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["condition"] = "<condition>",
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["doNotReplaceRegex"] = null
+,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["regex"] = null
+,
+["replaceWith"] = "<replaceWith>",
+}
+},
+                    ["rejectedPatterns"] = new List<object>()
+{
+null
+},
+                    ["scopedRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["bindingUrl"] = "<bindingUrl>",
+["rules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["isResourceSet"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+}
+},
+["storeType"] = "<storeType>",
+}
+},
+                    ["version"] = 1234,
                 },
-            };
-
-            Response response = client.CreateOrUpdateResourceSetRule(RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateResourceSetRule(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -491,13 +475,12 @@ public void Example_CreateOrUpdateResourceSetRule_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateResourceSetRule_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateResourceSetRuleAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateResourceSetRuleAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -507,141 +490,126 @@ public async Task Example_CreateOrUpdateResourceSetRule_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateResourceSetRule_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                advancedResourceSet = new
+                ["advancedResourceSet"] = new Dictionary<string, object>()
                 {
-                    modifiedAt = "2022-05-10T18:57:31.2311892Z",
-                    resourceSetProcessing = "Default",
+                    ["modifiedAt"] = "2022-05-10T18:57:31.2311892Z",
+                    ["resourceSetProcessing"] = "Default",
                 },
-                pathPatternConfig = new
+                ["pathPatternConfig"] = new Dictionary<string, object>()
                 {
-                    acceptedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-                    complexReplacers = new[] {
-            new {
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                typeName = "<typeName>",
-            }
-        },
-                    createdBy = "<createdBy>",
-                    enableDefaultPatterns = true,
-                    lastUpdatedTimestamp = 1234L,
-                    modifiedBy = "<modifiedBy>",
-                    normalizationRules = new[] {
-            new {
-                description = "<description>",
-                disabled = true,
-                dynamicReplacement = true,
-                entityTypes = new[] {
-                    "<String>"
-                },
-                lastUpdatedTimestamp = 1234L,
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-                version = 123.45d,
-            }
-        },
-                    regexReplacers = new[] {
-            new {
-                condition = "<condition>",
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                doNotReplaceRegex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-            }
-        },
-                    rejectedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-                    scopedRules = new[] {
-            new {
-                bindingUrl = "<bindingUrl>",
-                rules = new[] {
-                    new {
-                        displayName = "<displayName>",
-                        isResourceSet = true,
-                        lastUpdatedTimestamp = 1234L,
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                    }
-                },
-                storeType = "<storeType>",
-            }
-        },
-                    version = 1234,
+                    ["acceptedPatterns"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["filterType"] = "Pattern",
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["path"] = "<path>",
+}
+},
+                    ["complexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["typeName"] = "<typeName>",
+}
+},
+                    ["createdBy"] = "<createdBy>",
+                    ["enableDefaultPatterns"] = true,
+                    ["lastUpdatedTimestamp"] = 1234L,
+                    ["modifiedBy"] = "<modifiedBy>",
+                    ["normalizationRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["disabled"] = true,
+["dynamicReplacement"] = true,
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["regex"] = new Dictionary<string, object>()
+{
+["maxDigits"] = 1234,
+["maxLetters"] = 1234,
+["minDashes"] = 1234,
+["minDigits"] = 1234,
+["minDigitsOrLetters"] = 1234,
+["minDots"] = 1234,
+["minHex"] = 1234,
+["minLetters"] = 1234,
+["minUnderscores"] = 1234,
+["options"] = 1234,
+["regexStr"] = "<regexStr>",
+},
+["replaceWith"] = "<replaceWith>",
+["version"] = 123.45,
+}
+},
+                    ["regexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["condition"] = "<condition>",
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["doNotReplaceRegex"] = null
+,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["regex"] = null
+,
+["replaceWith"] = "<replaceWith>",
+}
+},
+                    ["rejectedPatterns"] = new List<object>()
+{
+null
+},
+                    ["scopedRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["bindingUrl"] = "<bindingUrl>",
+["rules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["isResourceSet"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+}
+},
+["storeType"] = "<storeType>",
+}
+},
+                    ["version"] = 1234,
                 },
-            };
-
-            Response response = await client.CreateOrUpdateResourceSetRuleAsync(RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateResourceSetRuleAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -735,9 +703,9 @@ public async Task Example_CreateOrUpdateResourceSetRule_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteResourceSetRule()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
             Response response = client.DeleteResourceSetRule();
             Console.WriteLine(response.Status);
@@ -747,9 +715,9 @@ public void Example_DeleteResourceSetRule()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteResourceSetRule_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
             Response response = client.DeleteResourceSetRule();
             Console.WriteLine(response.Status);
@@ -759,9 +727,9 @@ public void Example_DeleteResourceSetRule_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteResourceSetRule_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
             Response response = await client.DeleteResourceSetRuleAsync();
             Console.WriteLine(response.Status);
@@ -771,9 +739,9 @@ public async Task Example_DeleteResourceSetRule_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteResourceSetRule_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
             Response response = await client.DeleteResourceSetRuleAsync();
             Console.WriteLine(response.Status);
diff --git a/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewAccountClient.xml b/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewAccountClient.xml
index 1426615fbe14..7f35d5f27468 100644
--- a/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewAccountClient.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewAccountClient.xml
@@ -2,14 +2,25 @@
 <doc>
   <members>
     <member name="GetAccountPropertiesAsync(RequestContext)">
-<example>
-This sample shows how to call GetAccountPropertiesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAccountPropertiesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = await client.GetAccountPropertiesAsync(new RequestContext());
+Response response = await client.GetAccountPropertiesAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetAccountPropertiesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+Response response = await client.GetAccountPropertiesAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -48,20 +59,30 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAccountProperties(RequestContext)">
-<example>
-This sample shows how to call GetAccountProperties with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAccountProperties and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+Response response = client.GetAccountProperties(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetAccountProperties with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = client.GetAccountProperties(new RequestContext());
+Response response = client.GetAccountProperties(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -100,37 +121,35 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateAccountPropertiesAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call UpdateAccountPropertiesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-var data = new {};
-
-Response response = await client.UpdateAccountPropertiesAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.UpdateAccountPropertiesAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateAccountPropertiesAsync with all request content, and how to parse the result.
+This sample shows how to call UpdateAccountPropertiesAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
-
-var data = new {
-    friendlyName = "<friendlyName>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = await client.UpdateAccountPropertiesAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["friendlyName"] = "<friendlyName>",
+});
+Response response = await client.UpdateAccountPropertiesAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -169,37 +188,35 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateAccountProperties(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call UpdateAccountProperties and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-var data = new {};
-
-Response response = client.UpdateAccountProperties(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.UpdateAccountProperties(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateAccountProperties with all request content, and how to parse the result.
+This sample shows how to call UpdateAccountProperties with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
-
-var data = new {
-    friendlyName = "<friendlyName>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = client.UpdateAccountProperties(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["friendlyName"] = "<friendlyName>",
+});
+Response response = client.UpdateAccountProperties(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -238,362 +255,421 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAccessKeysAsync(RequestContext)">
-<example>
-This sample shows how to call GetAccessKeysAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAccessKeysAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+Response response = await client.GetAccessKeysAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetAccessKeysAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = await client.GetAccessKeysAsync(new RequestContext());
+Response response = await client.GetAccessKeysAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
 Console.WriteLine(result.GetProperty("atlasKafkaSecondaryEndpoint").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAccessKeys(RequestContext)">
-<example>
-This sample shows how to call GetAccessKeys with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAccessKeys and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+Response response = client.GetAccessKeys(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetAccessKeys with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = client.GetAccessKeys(new RequestContext());
+Response response = client.GetAccessKeys(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
 Console.WriteLine(result.GetProperty("atlasKafkaSecondaryEndpoint").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RegenerateAccessKeyAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call RegenerateAccessKeyAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-var data = new {};
-
-Response response = await client.RegenerateAccessKeyAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.RegenerateAccessKeyAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call RegenerateAccessKeyAsync with all request content, and how to parse the result.
+This sample shows how to call RegenerateAccessKeyAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
-
-var data = new {
-    keyType = "PrimaryAtlasKafkaKey",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = await client.RegenerateAccessKeyAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["keyType"] = "PrimaryAtlasKafkaKey",
+});
+Response response = await client.RegenerateAccessKeyAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
 Console.WriteLine(result.GetProperty("atlasKafkaSecondaryEndpoint").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RegenerateAccessKey(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call RegenerateAccessKey and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-var data = new {};
-
-Response response = client.RegenerateAccessKey(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.RegenerateAccessKey(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call RegenerateAccessKey with all request content, and how to parse the result.
+This sample shows how to call RegenerateAccessKey with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
-
-var data = new {
-    keyType = "PrimaryAtlasKafkaKey",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-Response response = client.RegenerateAccessKey(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["keyType"] = "PrimaryAtlasKafkaKey",
+});
+Response response = client.RegenerateAccessKey(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
 Console.WriteLine(result.GetProperty("atlasKafkaSecondaryEndpoint").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCollectionsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetCollectionsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCollectionsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-await foreach (var item in client.GetCollectionsAsync("<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetCollectionsAsync(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("parentCollection").GetProperty("referenceName").ToString());
-    Console.WriteLine(result.GetProperty("parentCollection").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("createdAt").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetCollectionsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetCollectionsAsync("<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("collectionProvisioningState").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("referenceName").ToString());
+    Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdAt").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdByType").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetCollections(string,RequestContext)">
-<example>
-This sample shows how to call GetCollections with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCollections and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-foreach (var item in client.GetCollections("<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetCollections(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("parentCollection").GetProperty("referenceName").ToString());
-    Console.WriteLine(result.GetProperty("parentCollection").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("createdAt").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetCollections with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetCollections("<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("collectionProvisioningState").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("referenceName").ToString());
+    Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdAt").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdByType").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetResourceSetRulesAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetResourceSetRulesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetResourceSetRulesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-await foreach (var item in client.GetResourceSetRulesAsync("<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetResourceSetRulesAsync(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
-    Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetResourceSetRulesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetResourceSetRulesAsync("<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
+    Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("version").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetResourceSetRules(string,RequestContext)">
-<example>
-This sample shows how to call GetResourceSetRules with required parameters and parse the result.
+      <example>
+This sample shows how to call GetResourceSetRules and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-foreach (var item in client.GetResourceSetRules("<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetResourceSetRules(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
-    Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
-    Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetResourceSetRules with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetResourceSetRules("<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
+    Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
+    Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("version").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewCollection.xml b/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewCollection.xml
index 74242221269f..49a11ca43bbb 100644
--- a/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewCollection.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewCollection.xml
@@ -2,14 +2,25 @@
 <doc>
   <members>
     <member name="GetCollectionAsync(RequestContext)">
-<example>
-This sample shows how to call GetCollectionAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCollectionAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-Response response = await client.GetCollectionAsync(new RequestContext());
+Response response = await client.GetCollectionAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCollectionAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+Response response = await client.GetCollectionAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -24,18 +35,28 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCollection(RequestContext)">
-<example>
-This sample shows how to call GetCollection with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCollection and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-Response response = client.GetCollection(new RequestContext());
+Response response = client.GetCollection(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCollection with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+Response response = client.GetCollection(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -50,39 +71,38 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateCollectionAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateCollectionAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateCollectionAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateCollectionAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateCollectionAsync with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateCollectionAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-var data = new {
-    description = "<description>",
-    friendlyName = "<friendlyName>",
-    parentCollection = new {
-        referenceName = "<referenceName>",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["description"] = "<description>",
+    ["friendlyName"] = "<friendlyName>",
+    ["parentCollection"] = new Dictionary<string, object>()
+    {
+        ["referenceName"] = "<referenceName>",
     },
-};
-
-Response response = await client.CreateOrUpdateCollectionAsync(RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateCollectionAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -97,39 +117,38 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateCollection(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateCollection and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-var data = new {};
-
-Response response = client.CreateOrUpdateCollection(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdateCollection(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateCollection with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateCollection with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-var data = new {
-    description = "<description>",
-    friendlyName = "<friendlyName>",
-    parentCollection = new {
-        referenceName = "<referenceName>",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["description"] = "<description>",
+    ["friendlyName"] = "<friendlyName>",
+    ["parentCollection"] = new Dictionary<string, object>()
+    {
+        ["referenceName"] = "<referenceName>",
     },
-};
-
-Response response = client.CreateOrUpdateCollection(RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdateCollection(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -144,100 +163,157 @@ Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
 Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteCollectionAsync(RequestContext)">
-<example>
+      <example>
 This sample shows how to call DeleteCollectionAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
 Response response = await client.DeleteCollectionAsync();
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteCollectionAsync with all request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+Response response = await client.DeleteCollectionAsync();
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteCollection(RequestContext)">
-<example>
+      <example>
 This sample shows how to call DeleteCollection.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
 Response response = client.DeleteCollection();
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteCollection with all request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+Response response = client.DeleteCollection();
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetCollectionPathAsync(RequestContext)">
-<example>
-This sample shows how to call GetCollectionPathAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCollectionPathAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+Response response = await client.GetCollectionPathAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCollectionPathAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-Response response = await client.GetCollectionPathAsync(new RequestContext());
+Response response = await client.GetCollectionPathAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("parentFriendlyNameChain")[0].ToString());
 Console.WriteLine(result.GetProperty("parentNameChain")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCollectionPath(RequestContext)">
-<example>
-This sample shows how to call GetCollectionPath with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCollectionPath and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-Response response = client.GetCollectionPath(new RequestContext());
+Response response = client.GetCollectionPath(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetCollectionPath with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+Response response = client.GetCollectionPath(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("parentFriendlyNameChain")[0].ToString());
 Console.WriteLine(result.GetProperty("parentNameChain")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetChildCollectionNamesAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetChildCollectionNamesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetChildCollectionNamesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-await foreach (var item in client.GetChildCollectionNamesAsync("<skipToken>", new RequestContext()))
+await foreach (BinaryData item in client.GetChildCollectionNamesAsync(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetChildCollectionNamesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+await foreach (BinaryData item in client.GetChildCollectionNamesAsync("<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetChildCollectionNames(string,RequestContext)">
-<example>
-This sample shows how to call GetChildCollectionNames with required parameters and parse the result.
+      <example>
+This sample shows how to call GetChildCollectionNames and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-foreach (var item in client.GetChildCollectionNames("<skipToken>", new RequestContext()))
+foreach (BinaryData item in client.GetChildCollectionNames(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("friendlyName").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetChildCollectionNames with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
+
+foreach (BinaryData item in client.GetChildCollectionNames("<skipToken>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewMetadataPolicyClient.xml b/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewMetadataPolicyClient.xml
index b9cd48ec0000..66ac29be1bae 100644
--- a/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewMetadataPolicyClient.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewMetadataPolicyClient.xml
@@ -2,81 +2,83 @@
 <doc>
   <members>
     <member name="UpdateMetadataPolicyAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateMetadataPolicyAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call UpdateMetadataPolicyAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
 
-var data = new {};
-
-Response response = await client.UpdateMetadataPolicyAsync("<policyId>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.UpdateMetadataPolicyAsync("<policyId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateMetadataPolicyAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call UpdateMetadataPolicyAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
 
-var data = new {
-    name = "<name>",
-    id = "<id>",
-    version = 1234,
-    properties = new {
-        description = "<description>",
-        decisionRules = new[] {
-            new {
-                effect = "Deny",
-                dnfCondition = new[] {
-                    new[] {
-                        new {
-                            attributeName = "<attributeName>",
-                            attributeValueIncludes = "<attributeValueIncludes>",
-                            attributeValueIncludedIn = new[] {
-                                "<String>"
-                            },
-                            attributeValueExcludes = "<attributeValueExcludes>",
-                            attributeValueExcludedIn = new[] {
-                                "<String>"
-                            },
-                        }
-                    }
-                },
-            }
-        },
-        attributeRules = new[] {
-            new {
-                id = "<id>",
-                name = "<name>",
-                dnfCondition = new[] {
-                    new[] {
-                        new {
-                            attributeName = "<attributeName>",
-                            attributeValueIncludes = "<attributeValueIncludes>",
-                            attributeValueIncludedIn = new[] {
-                                "<String>"
-                            },
-                            attributeValueExcludes = "<attributeValueExcludes>",
-                            attributeValueExcludedIn = new[] {
-                                "<String>"
-                            },
-                        }
-                    }
-                },
-            }
-        },
-        collection = new {
-            referenceName = "<referenceName>",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["name"] = "<name>",
+    ["id"] = "<id>",
+    ["version"] = 1234,
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["description"] = "<description>",
+        ["decisionRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["effect"] = "Deny",
+["dnfCondition"] = new List<object>()
+{
+new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeName"] = "<attributeName>",
+["attributeValueIncludes"] = "<attributeValueIncludes>",
+["attributeValueIncludedIn"] = new List<object>()
+{
+"<attributeValueIncludedIn>"
+},
+["attributeValueExcludes"] = "<attributeValueExcludes>",
+["attributeValueExcludedIn"] = new List<object>()
+{
+"<attributeValueExcludedIn>"
+},
+}
+}
+},
+}
+},
+        ["attributeRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["name"] = "<name>",
+["dnfCondition"] = new List<object>()
+{
+new List<object>()
+{
+null
+}
+},
+}
+},
+        ["collection"] = new Dictionary<string, object>()
+        {
+            ["referenceName"] = "<referenceName>",
         },
-        parentCollectionName = "<parentCollectionName>",
+        ["parentCollectionName"] = "<parentCollectionName>",
     },
-};
-
-Response response = await client.UpdateMetadataPolicyAsync("<policyId>", RequestContent.Create(data));
+});
+Response response = await client.UpdateMetadataPolicyAsync("<policyId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
@@ -101,85 +103,86 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("attributeRules")
 Console.WriteLine(result.GetProperty("properties").GetProperty("collection").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("collection").GetProperty("referenceName").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("parentCollectionName").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateMetadataPolicy(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateMetadataPolicy with required parameters and parse the result.
+      <example>
+This sample shows how to call UpdateMetadataPolicy and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
 
-Response response = client.UpdateMetadataPolicy("<policyId>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.UpdateMetadataPolicy("<policyId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateMetadataPolicy with all parameters and request content, and how to parse the result.
+This sample shows how to call UpdateMetadataPolicy with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
 
-var data = new {
-    name = "<name>",
-    id = "<id>",
-    version = 1234,
-    properties = new {
-        description = "<description>",
-        decisionRules = new[] {
-            new {
-                effect = "Deny",
-                dnfCondition = new[] {
-                    new[] {
-                        new {
-                            attributeName = "<attributeName>",
-                            attributeValueIncludes = "<attributeValueIncludes>",
-                            attributeValueIncludedIn = new[] {
-                                "<String>"
-                            },
-                            attributeValueExcludes = "<attributeValueExcludes>",
-                            attributeValueExcludedIn = new[] {
-                                "<String>"
-                            },
-                        }
-                    }
-                },
-            }
-        },
-        attributeRules = new[] {
-            new {
-                id = "<id>",
-                name = "<name>",
-                dnfCondition = new[] {
-                    new[] {
-                        new {
-                            attributeName = "<attributeName>",
-                            attributeValueIncludes = "<attributeValueIncludes>",
-                            attributeValueIncludedIn = new[] {
-                                "<String>"
-                            },
-                            attributeValueExcludes = "<attributeValueExcludes>",
-                            attributeValueExcludedIn = new[] {
-                                "<String>"
-                            },
-                        }
-                    }
-                },
-            }
-        },
-        collection = new {
-            referenceName = "<referenceName>",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["name"] = "<name>",
+    ["id"] = "<id>",
+    ["version"] = 1234,
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["description"] = "<description>",
+        ["decisionRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["effect"] = "Deny",
+["dnfCondition"] = new List<object>()
+{
+new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeName"] = "<attributeName>",
+["attributeValueIncludes"] = "<attributeValueIncludes>",
+["attributeValueIncludedIn"] = new List<object>()
+{
+"<attributeValueIncludedIn>"
+},
+["attributeValueExcludes"] = "<attributeValueExcludes>",
+["attributeValueExcludedIn"] = new List<object>()
+{
+"<attributeValueExcludedIn>"
+},
+}
+}
+},
+}
+},
+        ["attributeRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["name"] = "<name>",
+["dnfCondition"] = new List<object>()
+{
+new List<object>()
+{
+null
+}
+},
+}
+},
+        ["collection"] = new Dictionary<string, object>()
+        {
+            ["referenceName"] = "<referenceName>",
         },
-        parentCollectionName = "<parentCollectionName>",
+        ["parentCollectionName"] = "<parentCollectionName>",
     },
-};
-
-Response response = client.UpdateMetadataPolicy("<policyId>", RequestContent.Create(data));
+});
+Response response = client.UpdateMetadataPolicy("<policyId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
@@ -204,18 +207,28 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("attributeRules")
 Console.WriteLine(result.GetProperty("properties").GetProperty("collection").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("collection").GetProperty("referenceName").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("parentCollectionName").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetMetadataPolicyAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetMetadataPolicyAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMetadataPolicyAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
+
+Response response = await client.GetMetadataPolicyAsync("<policyId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetMetadataPolicyAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
 
-Response response = await client.GetMetadataPolicyAsync("<policyId>", new RequestContext());
+Response response = await client.GetMetadataPolicyAsync("<policyId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
@@ -240,18 +253,28 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("attributeRules")
 Console.WriteLine(result.GetProperty("properties").GetProperty("collection").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("collection").GetProperty("referenceName").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("parentCollectionName").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetMetadataPolicy(string,RequestContext)">
-<example>
-This sample shows how to call GetMetadataPolicy with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMetadataPolicy and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
+
+Response response = client.GetMetadataPolicy("<policyId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetMetadataPolicy with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
 
-Response response = client.GetMetadataPolicy("<policyId>", new RequestContext());
+Response response = client.GetMetadataPolicy("<policyId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("name").ToString());
@@ -276,36 +299,61 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("attributeRules")
 Console.WriteLine(result.GetProperty("properties").GetProperty("collection").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("collection").GetProperty("referenceName").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("parentCollectionName").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetMetadataPoliciesAsync(RequestContext)">
-<example>
-This sample shows how to call GetMetadataPoliciesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMetadataPoliciesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, "<CollectionName>", credential);
 
-await foreach (var item in client.GetMetadataPoliciesAsync(new RequestContext()))
+await foreach (BinaryData item in client.GetMetadataPoliciesAsync(null))
 {
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result.ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetMetadataPoliciesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, "<CollectionName>", credential);
+
+await foreach (BinaryData item in client.GetMetadataPoliciesAsync(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result.ToString());
+}
+]]></code></example>
     </member>
     <member name="GetMetadataPolicies(RequestContext)">
-<example>
-This sample shows how to call GetMetadataPolicies with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMetadataPolicies and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, "<CollectionName>", credential);
 
-foreach (var item in client.GetMetadataPolicies(new RequestContext()))
+foreach (BinaryData item in client.GetMetadataPolicies(null))
 {
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result.ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetMetadataPolicies with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, "<CollectionName>", credential);
+
+foreach (BinaryData item in client.GetMetadataPolicies(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result.ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewMetadataRolesClient.xml b/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewMetadataRolesClient.xml
index 4a0cd331b7a7..5d4c8020ab20 100644
--- a/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewMetadataRolesClient.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewMetadataRolesClient.xml
@@ -2,32 +2,58 @@
 <doc>
   <members>
     <member name="GetMetadataRolesAsync(RequestContext)">
-<example>
-This sample shows how to call GetMetadataRolesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMetadataRolesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewMetadataRolesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataRolesClient client = new PurviewMetadataRolesClient(endpoint, credential);
 
-await foreach (var item in client.GetMetadataRolesAsync(new RequestContext()))
+await foreach (BinaryData item in client.GetMetadataRolesAsync(null))
 {
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result.ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetMetadataRolesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataRolesClient client = new PurviewMetadataRolesClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetMetadataRolesAsync(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result.ToString());
+}
+]]></code></example>
     </member>
     <member name="GetMetadataRoles(RequestContext)">
-<example>
-This sample shows how to call GetMetadataRoles with required parameters and parse the result.
+      <example>
+This sample shows how to call GetMetadataRoles and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewMetadataRolesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataRolesClient client = new PurviewMetadataRolesClient(endpoint, credential);
 
-foreach (var item in client.GetMetadataRoles(new RequestContext()))
+foreach (BinaryData item in client.GetMetadataRoles(null))
 {
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result.ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetMetadataRoles with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewMetadataRolesClient client = new PurviewMetadataRolesClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetMetadataRoles(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result.ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewResourceSetRule.xml b/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewResourceSetRule.xml
index c41035842cca..c8aa9ca1f6db 100644
--- a/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewResourceSetRule.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Administration/src/Generated/Docs/PurviewResourceSetRule.xml
@@ -2,14 +2,25 @@
 <doc>
   <members>
     <member name="GetResourceSetRuleAsync(RequestContext)">
-<example>
-This sample shows how to call GetResourceSetRuleAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetResourceSetRuleAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-Response response = await client.GetResourceSetRuleAsync(new RequestContext());
+Response response = await client.GetResourceSetRuleAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetResourceSetRuleAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+
+Response response = await client.GetResourceSetRuleAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -97,18 +108,28 @@ Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRul
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetResourceSetRule(RequestContext)">
-<example>
-This sample shows how to call GetResourceSetRule with required parameters and parse the result.
+      <example>
+This sample shows how to call GetResourceSetRule and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-Response response = client.GetResourceSetRule(new RequestContext());
+Response response = client.GetResourceSetRule(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetResourceSetRule with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+
+Response response = client.GetResourceSetRule(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -196,158 +217,144 @@ Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRul
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateResourceSetRuleAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateResourceSetRuleAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateResourceSetRuleAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateResourceSetRuleAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateResourceSetRuleAsync with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateResourceSetRuleAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-var data = new {
-    advancedResourceSet = new {
-        modifiedAt = "2022-05-10T18:57:31.2311892Z",
-        resourceSetProcessing = "Default",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["advancedResourceSet"] = new Dictionary<string, object>()
+    {
+        ["modifiedAt"] = "2022-05-10T18:57:31.2311892Z",
+        ["resourceSetProcessing"] = "Default",
     },
-    pathPatternConfig = new {
-        acceptedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-        complexReplacers = new[] {
-            new {
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                typeName = "<typeName>",
-            }
-        },
-        createdBy = "<createdBy>",
-        enableDefaultPatterns = true,
-        lastUpdatedTimestamp = 1234L,
-        modifiedBy = "<modifiedBy>",
-        normalizationRules = new[] {
-            new {
-                description = "<description>",
-                disabled = true,
-                dynamicReplacement = true,
-                entityTypes = new[] {
-                    "<String>"
-                },
-                lastUpdatedTimestamp = 1234L,
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-                version = 123.45d,
-            }
-        },
-        regexReplacers = new[] {
-            new {
-                condition = "<condition>",
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                doNotReplaceRegex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-            }
-        },
-        rejectedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-        scopedRules = new[] {
-            new {
-                bindingUrl = "<bindingUrl>",
-                rules = new[] {
-                    new {
-                        displayName = "<displayName>",
-                        isResourceSet = true,
-                        lastUpdatedTimestamp = 1234L,
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                    }
-                },
-                storeType = "<storeType>",
-            }
-        },
-        version = 1234,
+    ["pathPatternConfig"] = new Dictionary<string, object>()
+    {
+        ["acceptedPatterns"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["filterType"] = "Pattern",
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["path"] = "<path>",
+}
+},
+        ["complexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["typeName"] = "<typeName>",
+}
+},
+        ["createdBy"] = "<createdBy>",
+        ["enableDefaultPatterns"] = true,
+        ["lastUpdatedTimestamp"] = 1234L,
+        ["modifiedBy"] = "<modifiedBy>",
+        ["normalizationRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["disabled"] = true,
+["dynamicReplacement"] = true,
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["regex"] = new Dictionary<string, object>()
+{
+["maxDigits"] = 1234,
+["maxLetters"] = 1234,
+["minDashes"] = 1234,
+["minDigits"] = 1234,
+["minDigitsOrLetters"] = 1234,
+["minDots"] = 1234,
+["minHex"] = 1234,
+["minLetters"] = 1234,
+["minUnderscores"] = 1234,
+["options"] = 1234,
+["regexStr"] = "<regexStr>",
+},
+["replaceWith"] = "<replaceWith>",
+["version"] = 123.45,
+}
+},
+        ["regexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["condition"] = "<condition>",
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["doNotReplaceRegex"] = null
+,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["regex"] = null
+,
+["replaceWith"] = "<replaceWith>",
+}
+},
+        ["rejectedPatterns"] = new List<object>()
+{
+null
+},
+        ["scopedRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["bindingUrl"] = "<bindingUrl>",
+["rules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["isResourceSet"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+}
+},
+["storeType"] = "<storeType>",
+}
+},
+        ["version"] = 1234,
     },
-};
-
-Response response = await client.CreateOrUpdateResourceSetRuleAsync(RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateResourceSetRuleAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -435,158 +442,144 @@ Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRul
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateResourceSetRule(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateResourceSetRule and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-Response response = client.CreateOrUpdateResourceSetRule(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdateResourceSetRule(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateResourceSetRule with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateResourceSetRule with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-var data = new {
-    advancedResourceSet = new {
-        modifiedAt = "2022-05-10T18:57:31.2311892Z",
-        resourceSetProcessing = "Default",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["advancedResourceSet"] = new Dictionary<string, object>()
+    {
+        ["modifiedAt"] = "2022-05-10T18:57:31.2311892Z",
+        ["resourceSetProcessing"] = "Default",
     },
-    pathPatternConfig = new {
-        acceptedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-        complexReplacers = new[] {
-            new {
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                typeName = "<typeName>",
-            }
-        },
-        createdBy = "<createdBy>",
-        enableDefaultPatterns = true,
-        lastUpdatedTimestamp = 1234L,
-        modifiedBy = "<modifiedBy>",
-        normalizationRules = new[] {
-            new {
-                description = "<description>",
-                disabled = true,
-                dynamicReplacement = true,
-                entityTypes = new[] {
-                    "<String>"
-                },
-                lastUpdatedTimestamp = 1234L,
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-                version = 123.45d,
-            }
-        },
-        regexReplacers = new[] {
-            new {
-                condition = "<condition>",
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                doNotReplaceRegex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-            }
-        },
-        rejectedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-        scopedRules = new[] {
-            new {
-                bindingUrl = "<bindingUrl>",
-                rules = new[] {
-                    new {
-                        displayName = "<displayName>",
-                        isResourceSet = true,
-                        lastUpdatedTimestamp = 1234L,
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                    }
-                },
-                storeType = "<storeType>",
-            }
-        },
-        version = 1234,
+    ["pathPatternConfig"] = new Dictionary<string, object>()
+    {
+        ["acceptedPatterns"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["filterType"] = "Pattern",
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["path"] = "<path>",
+}
+},
+        ["complexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["typeName"] = "<typeName>",
+}
+},
+        ["createdBy"] = "<createdBy>",
+        ["enableDefaultPatterns"] = true,
+        ["lastUpdatedTimestamp"] = 1234L,
+        ["modifiedBy"] = "<modifiedBy>",
+        ["normalizationRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["disabled"] = true,
+["dynamicReplacement"] = true,
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["regex"] = new Dictionary<string, object>()
+{
+["maxDigits"] = 1234,
+["maxLetters"] = 1234,
+["minDashes"] = 1234,
+["minDigits"] = 1234,
+["minDigitsOrLetters"] = 1234,
+["minDots"] = 1234,
+["minHex"] = 1234,
+["minLetters"] = 1234,
+["minUnderscores"] = 1234,
+["options"] = 1234,
+["regexStr"] = "<regexStr>",
+},
+["replaceWith"] = "<replaceWith>",
+["version"] = 123.45,
+}
+},
+        ["regexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["condition"] = "<condition>",
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["doNotReplaceRegex"] = null
+,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["regex"] = null
+,
+["replaceWith"] = "<replaceWith>",
+}
+},
+        ["rejectedPatterns"] = new List<object>()
+{
+null
+},
+        ["scopedRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["bindingUrl"] = "<bindingUrl>",
+["rules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["isResourceSet"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+}
+},
+["storeType"] = "<storeType>",
+}
+},
+        ["version"] = 1234,
     },
-};
-
-Response response = client.CreateOrUpdateResourceSetRule(RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdateResourceSetRule(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -674,34 +667,49 @@ Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRul
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
 Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteResourceSetRuleAsync(RequestContext)">
-<example>
+      <example>
 This sample shows how to call DeleteResourceSetRuleAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
 Response response = await client.DeleteResourceSetRuleAsync();
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteResourceSetRuleAsync with all request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+
+Response response = await client.DeleteResourceSetRuleAsync();
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteResourceSetRule(RequestContext)">
-<example>
+      <example>
 This sample shows how to call DeleteResourceSetRule.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
 Response response = client.DeleteResourceSetRule();
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteResourceSetRule with all request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+
+Response response = client.DeleteResourceSetRule();
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewAccountClient.cs b/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewAccountClient.cs
index 05cbc8eafee7..8bc9306ec227 100644
--- a/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewAccountClient.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewAccountClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Administration;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +23,11 @@ public class Samples_PurviewAccountClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAccountProperties()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = client.GetAccountProperties(new RequestContext());
+            Response response = client.GetAccountProperties(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -37,11 +37,11 @@ public void Example_GetAccountProperties()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAccountProperties_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = client.GetAccountProperties(new RequestContext());
+            Response response = client.GetAccountProperties(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -80,7 +80,7 @@ public void Example_GetAccountProperties_AllParameters()
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("type").ToString());
         }
 
@@ -88,11 +88,11 @@ public void Example_GetAccountProperties_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAccountProperties_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = await client.GetAccountPropertiesAsync(new RequestContext());
+            Response response = await client.GetAccountPropertiesAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -102,11 +102,11 @@ public async Task Example_GetAccountProperties_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAccountProperties_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = await client.GetAccountPropertiesAsync(new RequestContext());
+            Response response = await client.GetAccountPropertiesAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -145,7 +145,7 @@ public async Task Example_GetAccountProperties_AllParameters_Async()
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("type").ToString());
         }
 
@@ -153,13 +153,12 @@ public async Task Example_GetAccountProperties_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateAccountProperties()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = client.UpdateAccountProperties(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.UpdateAccountProperties(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -169,16 +168,15 @@ public void Example_UpdateAccountProperties()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateAccountProperties_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                friendlyName = "<friendlyName>",
-            };
-
-            Response response = client.UpdateAccountProperties(RequestContent.Create(data));
+                ["friendlyName"] = "<friendlyName>",
+            });
+            Response response = client.UpdateAccountProperties(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -217,7 +215,7 @@ public void Example_UpdateAccountProperties_AllParameters()
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("type").ToString());
         }
 
@@ -225,13 +223,12 @@ public void Example_UpdateAccountProperties_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateAccountProperties_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = await client.UpdateAccountPropertiesAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.UpdateAccountPropertiesAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -241,16 +238,15 @@ public async Task Example_UpdateAccountProperties_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateAccountProperties_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                friendlyName = "<friendlyName>",
-            };
-
-            Response response = await client.UpdateAccountPropertiesAsync(RequestContent.Create(data));
+                ["friendlyName"] = "<friendlyName>",
+            });
+            Response response = await client.UpdateAccountPropertiesAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -289,7 +285,7 @@ public async Task Example_UpdateAccountProperties_AllParameters_Async()
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
             Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("type").ToString());
         }
 
@@ -297,11 +293,11 @@ public async Task Example_UpdateAccountProperties_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAccessKeys()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = client.GetAccessKeys(new RequestContext());
+            Response response = client.GetAccessKeys(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -311,11 +307,11 @@ public void Example_GetAccessKeys()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAccessKeys_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = client.GetAccessKeys(new RequestContext());
+            Response response = client.GetAccessKeys(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
@@ -326,11 +322,11 @@ public void Example_GetAccessKeys_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAccessKeys_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = await client.GetAccessKeysAsync(new RequestContext());
+            Response response = await client.GetAccessKeysAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -340,11 +336,11 @@ public async Task Example_GetAccessKeys_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAccessKeys_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            Response response = await client.GetAccessKeysAsync(new RequestContext());
+            Response response = await client.GetAccessKeysAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
@@ -355,13 +351,12 @@ public async Task Example_GetAccessKeys_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_RegenerateAccessKey()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = client.RegenerateAccessKey(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.RegenerateAccessKey(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -371,16 +366,15 @@ public void Example_RegenerateAccessKey()
         [Ignore("Only validating compilation of examples")]
         public void Example_RegenerateAccessKey_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                keyType = "PrimaryAtlasKafkaKey",
-            };
-
-            Response response = client.RegenerateAccessKey(RequestContent.Create(data));
+                ["keyType"] = "PrimaryAtlasKafkaKey",
+            });
+            Response response = client.RegenerateAccessKey(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
@@ -391,13 +385,12 @@ public void Example_RegenerateAccessKey_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RegenerateAccessKey_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = await client.RegenerateAccessKeyAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.RegenerateAccessKeyAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -407,16 +400,15 @@ public async Task Example_RegenerateAccessKey_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RegenerateAccessKey_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                keyType = "PrimaryAtlasKafkaKey",
-            };
-
-            Response response = await client.RegenerateAccessKeyAsync(RequestContent.Create(data));
+                ["keyType"] = "PrimaryAtlasKafkaKey",
+            });
+            Response response = await client.RegenerateAccessKeyAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("atlasKafkaPrimaryEndpoint").ToString());
@@ -427,14 +419,14 @@ public async Task Example_RegenerateAccessKey_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCollections()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            foreach (var item in client.GetCollections("<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetCollections(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -442,25 +434,25 @@ public void Example_GetCollections()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCollections_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            foreach (var item in client.GetCollections("<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetCollections("<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("parentCollection").GetProperty("referenceName").ToString());
-                Console.WriteLine(result.GetProperty("parentCollection").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("createdAt").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
+                Console.WriteLine(result[0].GetProperty("collectionProvisioningState").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("referenceName").ToString());
+                Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdAt").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdByType").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
             }
         }
 
@@ -468,14 +460,14 @@ public void Example_GetCollections_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCollections_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            await foreach (var item in client.GetCollectionsAsync("<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetCollectionsAsync(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -483,25 +475,25 @@ public async Task Example_GetCollections_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCollections_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            await foreach (var item in client.GetCollectionsAsync("<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetCollectionsAsync("<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("parentCollection").GetProperty("referenceName").ToString());
-                Console.WriteLine(result.GetProperty("parentCollection").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("createdAt").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("createdByType").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
+                Console.WriteLine(result[0].GetProperty("collectionProvisioningState").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("referenceName").ToString());
+                Console.WriteLine(result[0].GetProperty("parentCollection").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdAt").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("createdByType").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedAt").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("systemData").GetProperty("lastModifiedByType").ToString());
             }
         }
 
@@ -509,14 +501,14 @@ public async Task Example_GetCollections_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetResourceSetRules()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            foreach (var item in client.GetResourceSetRules("<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetResourceSetRules(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -524,98 +516,98 @@ public void Example_GetResourceSetRules()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetResourceSetRules_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            foreach (var item in client.GetResourceSetRules("<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetResourceSetRules("<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
-                Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
+                Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("version").ToString());
             }
         }
 
@@ -623,14 +615,14 @@ public void Example_GetResourceSetRules_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetResourceSetRules_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            await foreach (var item in client.GetResourceSetRulesAsync("<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetResourceSetRulesAsync(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -638,98 +630,98 @@ public async Task Example_GetResourceSetRules_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetResourceSetRules_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewAccountClient client = new PurviewAccountClient(endpoint, credential);
 
-            await foreach (var item in client.GetResourceSetRulesAsync("<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetResourceSetRulesAsync("<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
-                Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
-                Console.WriteLine(result.GetProperty("pathPatternConfig").GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
+                Console.WriteLine(result[0].GetProperty("advancedResourceSet").GetProperty("resourceSetProcessing").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("filterType").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("acceptedPatterns")[0].GetProperty("path").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disabled").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("complexReplacers")[0].GetProperty("typeName").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("enableDefaultPatterns").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("disabled").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("dynamicReplacement").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("entityTypes")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minDots").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minHex").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("options").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("replaceWith").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("normalizationRules")[0].GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("condition").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disabled").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("disableRecursiveReplacerApplication").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("maxLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDashes").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDigitsOrLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minDots").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minHex").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("minUnderscores").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("options").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("doNotReplaceRegex").GetProperty("regexStr").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("maxLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDashes").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigits").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDigitsOrLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minDots").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minHex").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minLetters").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("minUnderscores").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("options").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("regex").GetProperty("regexStr").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("regexReplacers")[0].GetProperty("replaceWith").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("filterType").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("modifiedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("rejectedPatterns")[0].GetProperty("path").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("bindingUrl").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("displayName").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("isResourceSet").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("lastUpdatedTimestamp").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("rules")[0].GetProperty("qualifiedName").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("scopedRules")[0].GetProperty("storeType").ToString());
+                Console.WriteLine(result[0].GetProperty("pathPatternConfig").GetProperty("version").ToString());
             }
         }
     }
diff --git a/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewCollection.cs b/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewCollection.cs
index 3410b2312313..2c72a0523049 100644
--- a/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewCollection.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewCollection.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Administration;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +23,11 @@ internal class Samples_PurviewCollection
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCollection()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = client.GetCollection(new RequestContext());
+            Response response = client.GetCollection(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -37,11 +37,11 @@ public void Example_GetCollection()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCollection_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = client.GetCollection(new RequestContext());
+            Response response = client.GetCollection(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -62,11 +62,11 @@ public void Example_GetCollection_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCollection_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = await client.GetCollectionAsync(new RequestContext());
+            Response response = await client.GetCollectionAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -76,11 +76,11 @@ public async Task Example_GetCollection_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCollection_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = await client.GetCollectionAsync(new RequestContext());
+            Response response = await client.GetCollectionAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -101,13 +101,12 @@ public async Task Example_GetCollection_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateCollection()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdateCollection(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdateCollection(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -117,21 +116,20 @@ public void Example_CreateOrUpdateCollection()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateCollection_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                description = "<description>",
-                friendlyName = "<friendlyName>",
-                parentCollection = new
+                ["description"] = "<description>",
+                ["friendlyName"] = "<friendlyName>",
+                ["parentCollection"] = new Dictionary<string, object>()
                 {
-                    referenceName = "<referenceName>",
+                    ["referenceName"] = "<referenceName>",
                 },
-            };
-
-            Response response = client.CreateOrUpdateCollection(RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateCollection(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -152,13 +150,12 @@ public void Example_CreateOrUpdateCollection_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateCollection_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateCollectionAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateCollectionAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -168,21 +165,20 @@ public async Task Example_CreateOrUpdateCollection_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateCollection_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                description = "<description>",
-                friendlyName = "<friendlyName>",
-                parentCollection = new
+                ["description"] = "<description>",
+                ["friendlyName"] = "<friendlyName>",
+                ["parentCollection"] = new Dictionary<string, object>()
                 {
-                    referenceName = "<referenceName>",
+                    ["referenceName"] = "<referenceName>",
                 },
-            };
-
-            Response response = await client.CreateOrUpdateCollectionAsync(RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateCollectionAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("collectionProvisioningState").ToString());
@@ -203,9 +199,9 @@ public async Task Example_CreateOrUpdateCollection_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteCollection()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
             Response response = client.DeleteCollection();
             Console.WriteLine(response.Status);
@@ -215,9 +211,9 @@ public void Example_DeleteCollection()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteCollection_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
             Response response = client.DeleteCollection();
             Console.WriteLine(response.Status);
@@ -227,9 +223,9 @@ public void Example_DeleteCollection_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteCollection_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
             Response response = await client.DeleteCollectionAsync();
             Console.WriteLine(response.Status);
@@ -239,9 +235,9 @@ public async Task Example_DeleteCollection_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteCollection_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
             Response response = await client.DeleteCollectionAsync();
             Console.WriteLine(response.Status);
@@ -251,11 +247,11 @@ public async Task Example_DeleteCollection_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCollectionPath()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = client.GetCollectionPath(new RequestContext());
+            Response response = client.GetCollectionPath(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -265,11 +261,11 @@ public void Example_GetCollectionPath()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCollectionPath_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = client.GetCollectionPath(new RequestContext());
+            Response response = client.GetCollectionPath(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("parentFriendlyNameChain")[0].ToString());
@@ -280,11 +276,11 @@ public void Example_GetCollectionPath_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCollectionPath_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = await client.GetCollectionPathAsync(new RequestContext());
+            Response response = await client.GetCollectionPathAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -294,11 +290,11 @@ public async Task Example_GetCollectionPath_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCollectionPath_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            Response response = await client.GetCollectionPathAsync(new RequestContext());
+            Response response = await client.GetCollectionPathAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("parentFriendlyNameChain")[0].ToString());
@@ -309,14 +305,14 @@ public async Task Example_GetCollectionPath_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetChildCollectionNames()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            foreach (var item in client.GetChildCollectionNames("<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetChildCollectionNames(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -324,15 +320,15 @@ public void Example_GetChildCollectionNames()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetChildCollectionNames_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            foreach (var item in client.GetChildCollectionNames("<skipToken>", new RequestContext()))
+            foreach (BinaryData item in client.GetChildCollectionNames("<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -340,14 +336,14 @@ public void Example_GetChildCollectionNames_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetChildCollectionNames_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            await foreach (var item in client.GetChildCollectionNamesAsync("<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetChildCollectionNamesAsync(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -355,15 +351,15 @@ public async Task Example_GetChildCollectionNames_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetChildCollectionNames_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<collectionName>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollection client = new PurviewAccountClient(endpoint, credential).GetPurviewCollectionClient("<CollectionName>");
 
-            await foreach (var item in client.GetChildCollectionNamesAsync("<skipToken>", new RequestContext()))
+            await foreach (BinaryData item in client.GetChildCollectionNamesAsync("<skipToken>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("friendlyName").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("friendlyName").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
     }
diff --git a/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewMetadataPolicyClient.cs b/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewMetadataPolicyClient.cs
index 0236594e989d..459f9764c11f 100644
--- a/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewMetadataPolicyClient.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewMetadataPolicyClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Administration;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,13 +23,12 @@ public class Samples_PurviewMetadataPolicyClient
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateMetadataPolicy()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
 
-            var data = new { };
-
-            Response response = client.UpdateMetadataPolicy("<policyId>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.UpdateMetadataPolicy("<policyId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -39,68 +38,68 @@ public void Example_UpdateMetadataPolicy()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateMetadataPolicy_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                name = "<name>",
-                id = "<id>",
-                version = 1234,
-                properties = new
+                ["name"] = "<name>",
+                ["id"] = "<id>",
+                ["version"] = 1234,
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    description = "<description>",
-                    decisionRules = new[] {
-            new {
-                effect = "Deny",
-                dnfCondition = new[] {
-                    new[] {
-                        new {
-                            attributeName = "<attributeName>",
-                            attributeValueIncludes = "<attributeValueIncludes>",
-                            attributeValueIncludedIn = new[] {
-                                "<String>"
-                            },
-                            attributeValueExcludes = "<attributeValueExcludes>",
-                            attributeValueExcludedIn = new[] {
-                                "<String>"
-                            },
-                        }
-                    }
-                },
-            }
-        },
-                    attributeRules = new[] {
-            new {
-                id = "<id>",
-                name = "<name>",
-                dnfCondition = new[] {
-                    new[] {
-                        new {
-                            attributeName = "<attributeName>",
-                            attributeValueIncludes = "<attributeValueIncludes>",
-                            attributeValueIncludedIn = new[] {
-                                "<String>"
-                            },
-                            attributeValueExcludes = "<attributeValueExcludes>",
-                            attributeValueExcludedIn = new[] {
-                                "<String>"
-                            },
-                        }
-                    }
-                },
-            }
-        },
-                    collection = new
+                    ["description"] = "<description>",
+                    ["decisionRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["effect"] = "Deny",
+["dnfCondition"] = new List<object>()
+{
+new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeName"] = "<attributeName>",
+["attributeValueIncludes"] = "<attributeValueIncludes>",
+["attributeValueIncludedIn"] = new List<object>()
+{
+"<attributeValueIncludedIn>"
+},
+["attributeValueExcludes"] = "<attributeValueExcludes>",
+["attributeValueExcludedIn"] = new List<object>()
+{
+"<attributeValueExcludedIn>"
+},
+}
+}
+},
+}
+},
+                    ["attributeRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["name"] = "<name>",
+["dnfCondition"] = new List<object>()
+{
+new List<object>()
+{
+null
+}
+},
+}
+},
+                    ["collection"] = new Dictionary<string, object>()
                     {
-                        referenceName = "<referenceName>",
+                        ["referenceName"] = "<referenceName>",
                     },
-                    parentCollectionName = "<parentCollectionName>",
+                    ["parentCollectionName"] = "<parentCollectionName>",
                 },
-            };
-
-            Response response = client.UpdateMetadataPolicy("<policyId>", RequestContent.Create(data));
+            });
+            Response response = client.UpdateMetadataPolicy("<policyId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -131,13 +130,12 @@ public void Example_UpdateMetadataPolicy_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateMetadataPolicy_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
 
-            var data = new { };
-
-            Response response = await client.UpdateMetadataPolicyAsync("<policyId>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.UpdateMetadataPolicyAsync("<policyId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -147,68 +145,68 @@ public async Task Example_UpdateMetadataPolicy_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateMetadataPolicy_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                name = "<name>",
-                id = "<id>",
-                version = 1234,
-                properties = new
+                ["name"] = "<name>",
+                ["id"] = "<id>",
+                ["version"] = 1234,
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    description = "<description>",
-                    decisionRules = new[] {
-            new {
-                effect = "Deny",
-                dnfCondition = new[] {
-                    new[] {
-                        new {
-                            attributeName = "<attributeName>",
-                            attributeValueIncludes = "<attributeValueIncludes>",
-                            attributeValueIncludedIn = new[] {
-                                "<String>"
-                            },
-                            attributeValueExcludes = "<attributeValueExcludes>",
-                            attributeValueExcludedIn = new[] {
-                                "<String>"
-                            },
-                        }
-                    }
-                },
-            }
-        },
-                    attributeRules = new[] {
-            new {
-                id = "<id>",
-                name = "<name>",
-                dnfCondition = new[] {
-                    new[] {
-                        new {
-                            attributeName = "<attributeName>",
-                            attributeValueIncludes = "<attributeValueIncludes>",
-                            attributeValueIncludedIn = new[] {
-                                "<String>"
-                            },
-                            attributeValueExcludes = "<attributeValueExcludes>",
-                            attributeValueExcludedIn = new[] {
-                                "<String>"
-                            },
-                        }
-                    }
-                },
-            }
-        },
-                    collection = new
+                    ["description"] = "<description>",
+                    ["decisionRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["effect"] = "Deny",
+["dnfCondition"] = new List<object>()
+{
+new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeName"] = "<attributeName>",
+["attributeValueIncludes"] = "<attributeValueIncludes>",
+["attributeValueIncludedIn"] = new List<object>()
+{
+"<attributeValueIncludedIn>"
+},
+["attributeValueExcludes"] = "<attributeValueExcludes>",
+["attributeValueExcludedIn"] = new List<object>()
+{
+"<attributeValueExcludedIn>"
+},
+}
+}
+},
+}
+},
+                    ["attributeRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["name"] = "<name>",
+["dnfCondition"] = new List<object>()
+{
+new List<object>()
+{
+null
+}
+},
+}
+},
+                    ["collection"] = new Dictionary<string, object>()
                     {
-                        referenceName = "<referenceName>",
+                        ["referenceName"] = "<referenceName>",
                     },
-                    parentCollectionName = "<parentCollectionName>",
+                    ["parentCollectionName"] = "<parentCollectionName>",
                 },
-            };
-
-            Response response = await client.UpdateMetadataPolicyAsync("<policyId>", RequestContent.Create(data));
+            });
+            Response response = await client.UpdateMetadataPolicyAsync("<policyId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -239,11 +237,11 @@ public async Task Example_UpdateMetadataPolicy_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMetadataPolicy()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
 
-            Response response = client.GetMetadataPolicy("<policyId>", new RequestContext());
+            Response response = client.GetMetadataPolicy("<policyId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -253,11 +251,11 @@ public void Example_GetMetadataPolicy()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMetadataPolicy_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
 
-            Response response = client.GetMetadataPolicy("<policyId>", new RequestContext());
+            Response response = client.GetMetadataPolicy("<policyId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -288,11 +286,11 @@ public void Example_GetMetadataPolicy_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMetadataPolicy_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
 
-            Response response = await client.GetMetadataPolicyAsync("<policyId>", new RequestContext());
+            Response response = await client.GetMetadataPolicyAsync("<policyId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -302,11 +300,11 @@ public async Task Example_GetMetadataPolicy_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMetadataPolicy_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, null, credential);
 
-            Response response = await client.GetMetadataPolicyAsync("<policyId>", new RequestContext());
+            Response response = await client.GetMetadataPolicyAsync("<policyId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("name").ToString());
@@ -337,12 +335,14 @@ public async Task Example_GetMetadataPolicy_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMetadataPolicies()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, "<CollectionName>", credential);
 
-            foreach (var item in client.GetMetadataPolicies(new RequestContext()))
+            foreach (BinaryData item in client.GetMetadataPolicies(null))
             {
+                JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+                Console.WriteLine(result.ToString());
             }
         }
 
@@ -350,12 +350,14 @@ public void Example_GetMetadataPolicies()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMetadataPolicies_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, "<CollectionName>", credential);
 
-            foreach (var item in client.GetMetadataPolicies(new RequestContext()))
+            foreach (BinaryData item in client.GetMetadataPolicies(null))
             {
+                JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+                Console.WriteLine(result.ToString());
             }
         }
 
@@ -363,12 +365,14 @@ public void Example_GetMetadataPolicies_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMetadataPolicies_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, "<CollectionName>", credential);
 
-            await foreach (var item in client.GetMetadataPoliciesAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetMetadataPoliciesAsync(null))
             {
+                JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+                Console.WriteLine(result.ToString());
             }
         }
 
@@ -376,12 +380,14 @@ public async Task Example_GetMetadataPolicies_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMetadataPolicies_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataPolicyClient(endpoint, "<collectionName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataPolicyClient client = new PurviewMetadataPolicyClient(endpoint, "<CollectionName>", credential);
 
-            await foreach (var item in client.GetMetadataPoliciesAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetMetadataPoliciesAsync(null))
             {
+                JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+                Console.WriteLine(result.ToString());
             }
         }
     }
diff --git a/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewMetadataRolesClient.cs b/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewMetadataRolesClient.cs
index 5ee30fb48e1b..825f8cb8f5fc 100644
--- a/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewMetadataRolesClient.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewMetadataRolesClient.cs
@@ -6,11 +6,9 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
-using Azure;
+using Azure.Analytics.Purview.Administration;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,12 +21,14 @@ public class Samples_PurviewMetadataRolesClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMetadataRoles()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataRolesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataRolesClient client = new PurviewMetadataRolesClient(endpoint, credential);
 
-            foreach (var item in client.GetMetadataRoles(new RequestContext()))
+            foreach (BinaryData item in client.GetMetadataRoles(null))
             {
+                JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+                Console.WriteLine(result.ToString());
             }
         }
 
@@ -36,12 +36,14 @@ public void Example_GetMetadataRoles()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetMetadataRoles_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataRolesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataRolesClient client = new PurviewMetadataRolesClient(endpoint, credential);
 
-            foreach (var item in client.GetMetadataRoles(new RequestContext()))
+            foreach (BinaryData item in client.GetMetadataRoles(null))
             {
+                JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+                Console.WriteLine(result.ToString());
             }
         }
 
@@ -49,12 +51,14 @@ public void Example_GetMetadataRoles_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMetadataRoles_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataRolesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataRolesClient client = new PurviewMetadataRolesClient(endpoint, credential);
 
-            await foreach (var item in client.GetMetadataRolesAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetMetadataRolesAsync(null))
             {
+                JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+                Console.WriteLine(result.ToString());
             }
         }
 
@@ -62,12 +66,14 @@ public async Task Example_GetMetadataRoles_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetMetadataRoles_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewMetadataRolesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewMetadataRolesClient client = new PurviewMetadataRolesClient(endpoint, credential);
 
-            await foreach (var item in client.GetMetadataRolesAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetMetadataRolesAsync(null))
             {
+                JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+                Console.WriteLine(result.ToString());
             }
         }
     }
diff --git a/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewResourceSetRule.cs b/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewResourceSetRule.cs
index 8a1e5720b9f7..4013223f1c2b 100644
--- a/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewResourceSetRule.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Administration/tests/Generated/Samples/Samples_PurviewResourceSetRule.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Administration;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +23,11 @@ internal class Samples_PurviewResourceSetRule
         [Ignore("Only validating compilation of examples")]
         public void Example_GetResourceSetRule()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            Response response = client.GetResourceSetRule(new RequestContext());
+            Response response = client.GetResourceSetRule(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -37,11 +37,11 @@ public void Example_GetResourceSetRule()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetResourceSetRule_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            Response response = client.GetResourceSetRule(new RequestContext());
+            Response response = client.GetResourceSetRule(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -135,11 +135,11 @@ public void Example_GetResourceSetRule_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetResourceSetRule_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            Response response = await client.GetResourceSetRuleAsync(new RequestContext());
+            Response response = await client.GetResourceSetRuleAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -149,11 +149,11 @@ public async Task Example_GetResourceSetRule_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetResourceSetRule_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            Response response = await client.GetResourceSetRuleAsync(new RequestContext());
+            Response response = await client.GetResourceSetRuleAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -247,13 +247,12 @@ public async Task Example_GetResourceSetRule_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateResourceSetRule()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdateResourceSetRule(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdateResourceSetRule(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -263,141 +262,126 @@ public void Example_CreateOrUpdateResourceSetRule()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateResourceSetRule_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                advancedResourceSet = new
+                ["advancedResourceSet"] = new Dictionary<string, object>()
                 {
-                    modifiedAt = "2022-05-10T18:57:31.2311892Z",
-                    resourceSetProcessing = "Default",
+                    ["modifiedAt"] = "2022-05-10T18:57:31.2311892Z",
+                    ["resourceSetProcessing"] = "Default",
                 },
-                pathPatternConfig = new
+                ["pathPatternConfig"] = new Dictionary<string, object>()
                 {
-                    acceptedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-                    complexReplacers = new[] {
-            new {
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                typeName = "<typeName>",
-            }
-        },
-                    createdBy = "<createdBy>",
-                    enableDefaultPatterns = true,
-                    lastUpdatedTimestamp = 1234L,
-                    modifiedBy = "<modifiedBy>",
-                    normalizationRules = new[] {
-            new {
-                description = "<description>",
-                disabled = true,
-                dynamicReplacement = true,
-                entityTypes = new[] {
-                    "<String>"
-                },
-                lastUpdatedTimestamp = 1234L,
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-                version = 123.45d,
-            }
-        },
-                    regexReplacers = new[] {
-            new {
-                condition = "<condition>",
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                doNotReplaceRegex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-            }
-        },
-                    rejectedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-                    scopedRules = new[] {
-            new {
-                bindingUrl = "<bindingUrl>",
-                rules = new[] {
-                    new {
-                        displayName = "<displayName>",
-                        isResourceSet = true,
-                        lastUpdatedTimestamp = 1234L,
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                    }
-                },
-                storeType = "<storeType>",
-            }
-        },
-                    version = 1234,
+                    ["acceptedPatterns"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["filterType"] = "Pattern",
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["path"] = "<path>",
+}
+},
+                    ["complexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["typeName"] = "<typeName>",
+}
+},
+                    ["createdBy"] = "<createdBy>",
+                    ["enableDefaultPatterns"] = true,
+                    ["lastUpdatedTimestamp"] = 1234L,
+                    ["modifiedBy"] = "<modifiedBy>",
+                    ["normalizationRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["disabled"] = true,
+["dynamicReplacement"] = true,
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["regex"] = new Dictionary<string, object>()
+{
+["maxDigits"] = 1234,
+["maxLetters"] = 1234,
+["minDashes"] = 1234,
+["minDigits"] = 1234,
+["minDigitsOrLetters"] = 1234,
+["minDots"] = 1234,
+["minHex"] = 1234,
+["minLetters"] = 1234,
+["minUnderscores"] = 1234,
+["options"] = 1234,
+["regexStr"] = "<regexStr>",
+},
+["replaceWith"] = "<replaceWith>",
+["version"] = 123.45,
+}
+},
+                    ["regexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["condition"] = "<condition>",
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["doNotReplaceRegex"] = null
+,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["regex"] = null
+,
+["replaceWith"] = "<replaceWith>",
+}
+},
+                    ["rejectedPatterns"] = new List<object>()
+{
+null
+},
+                    ["scopedRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["bindingUrl"] = "<bindingUrl>",
+["rules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["isResourceSet"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+}
+},
+["storeType"] = "<storeType>",
+}
+},
+                    ["version"] = 1234,
                 },
-            };
-
-            Response response = client.CreateOrUpdateResourceSetRule(RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateResourceSetRule(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -491,13 +475,12 @@ public void Example_CreateOrUpdateResourceSetRule_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateResourceSetRule_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateResourceSetRuleAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateResourceSetRuleAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -507,141 +490,126 @@ public async Task Example_CreateOrUpdateResourceSetRule_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateResourceSetRule_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                advancedResourceSet = new
+                ["advancedResourceSet"] = new Dictionary<string, object>()
                 {
-                    modifiedAt = "2022-05-10T18:57:31.2311892Z",
-                    resourceSetProcessing = "Default",
+                    ["modifiedAt"] = "2022-05-10T18:57:31.2311892Z",
+                    ["resourceSetProcessing"] = "Default",
                 },
-                pathPatternConfig = new
+                ["pathPatternConfig"] = new Dictionary<string, object>()
                 {
-                    acceptedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-                    complexReplacers = new[] {
-            new {
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                typeName = "<typeName>",
-            }
-        },
-                    createdBy = "<createdBy>",
-                    enableDefaultPatterns = true,
-                    lastUpdatedTimestamp = 1234L,
-                    modifiedBy = "<modifiedBy>",
-                    normalizationRules = new[] {
-            new {
-                description = "<description>",
-                disabled = true,
-                dynamicReplacement = true,
-                entityTypes = new[] {
-                    "<String>"
-                },
-                lastUpdatedTimestamp = 1234L,
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-                version = 123.45d,
-            }
-        },
-                    regexReplacers = new[] {
-            new {
-                condition = "<condition>",
-                createdBy = "<createdBy>",
-                description = "<description>",
-                disabled = true,
-                disableRecursiveReplacerApplication = true,
-                doNotReplaceRegex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                regex = new {
-                    maxDigits = 1234,
-                    maxLetters = 1234,
-                    minDashes = 1234,
-                    minDigits = 1234,
-                    minDigitsOrLetters = 1234,
-                    minDots = 1234,
-                    minHex = 1234,
-                    minLetters = 1234,
-                    minUnderscores = 1234,
-                    options = 1234,
-                    regexStr = "<regexStr>",
-                },
-                replaceWith = "<replaceWith>",
-            }
-        },
-                    rejectedPatterns = new[] {
-            new {
-                createdBy = "<createdBy>",
-                filterType = "Pattern",
-                lastUpdatedTimestamp = 1234L,
-                modifiedBy = "<modifiedBy>",
-                name = "<name>",
-                path = "<path>",
-            }
-        },
-                    scopedRules = new[] {
-            new {
-                bindingUrl = "<bindingUrl>",
-                rules = new[] {
-                    new {
-                        displayName = "<displayName>",
-                        isResourceSet = true,
-                        lastUpdatedTimestamp = 1234L,
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                    }
-                },
-                storeType = "<storeType>",
-            }
-        },
-                    version = 1234,
+                    ["acceptedPatterns"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["filterType"] = "Pattern",
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["path"] = "<path>",
+}
+},
+                    ["complexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["typeName"] = "<typeName>",
+}
+},
+                    ["createdBy"] = "<createdBy>",
+                    ["enableDefaultPatterns"] = true,
+                    ["lastUpdatedTimestamp"] = 1234L,
+                    ["modifiedBy"] = "<modifiedBy>",
+                    ["normalizationRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["disabled"] = true,
+["dynamicReplacement"] = true,
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["regex"] = new Dictionary<string, object>()
+{
+["maxDigits"] = 1234,
+["maxLetters"] = 1234,
+["minDashes"] = 1234,
+["minDigits"] = 1234,
+["minDigitsOrLetters"] = 1234,
+["minDots"] = 1234,
+["minHex"] = 1234,
+["minLetters"] = 1234,
+["minUnderscores"] = 1234,
+["options"] = 1234,
+["regexStr"] = "<regexStr>",
+},
+["replaceWith"] = "<replaceWith>",
+["version"] = 123.45,
+}
+},
+                    ["regexReplacers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["condition"] = "<condition>",
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["disabled"] = true,
+["disableRecursiveReplacerApplication"] = true,
+["doNotReplaceRegex"] = null
+,
+["lastUpdatedTimestamp"] = 1234L,
+["modifiedBy"] = "<modifiedBy>",
+["name"] = "<name>",
+["regex"] = null
+,
+["replaceWith"] = "<replaceWith>",
+}
+},
+                    ["rejectedPatterns"] = new List<object>()
+{
+null
+},
+                    ["scopedRules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["bindingUrl"] = "<bindingUrl>",
+["rules"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["isResourceSet"] = true,
+["lastUpdatedTimestamp"] = 1234L,
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+}
+},
+["storeType"] = "<storeType>",
+}
+},
+                    ["version"] = 1234,
                 },
-            };
-
-            Response response = await client.CreateOrUpdateResourceSetRuleAsync(RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateResourceSetRuleAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("advancedResourceSet").GetProperty("modifiedAt").ToString());
@@ -735,9 +703,9 @@ public async Task Example_CreateOrUpdateResourceSetRule_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteResourceSetRule()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
             Response response = client.DeleteResourceSetRule();
             Console.WriteLine(response.Status);
@@ -747,9 +715,9 @@ public void Example_DeleteResourceSetRule()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteResourceSetRule_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
             Response response = client.DeleteResourceSetRule();
             Console.WriteLine(response.Status);
@@ -759,9 +727,9 @@ public void Example_DeleteResourceSetRule_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteResourceSetRule_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
             Response response = await client.DeleteResourceSetRuleAsync();
             Console.WriteLine(response.Status);
@@ -771,9 +739,9 @@ public async Task Example_DeleteResourceSetRule_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteResourceSetRule_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewResourceSetRule client = new PurviewAccountClient(endpoint, credential).GetPurviewResourceSetRuleClient();
 
             Response response = await client.DeleteResourceSetRuleAsync();
             Console.WriteLine(response.Status);
diff --git a/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewCatalogClient.xml b/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewCatalogClient.xml
index 5bbc01db73e9..2fcfad621fa7 100644
--- a/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewCatalogClient.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewCatalogClient.xml
@@ -2,51 +2,51 @@
 <doc>
   <members>
     <member name="SearchAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call SearchAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-var data = new {};
-
-Response response = await client.SearchAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.SearchAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call SearchAsync with all request content, and how to parse the result.
+This sample shows how to call SearchAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
-
-var data = new {
-    keywords = "<keywords>",
-    offset = 1234,
-    limit = 1234,
-    filter = new {},
-    facets = new[] {
-        new {
-            count = 1234,
-            facet = "<facet>",
-            sort = new {},
-        }
-    },
-    taxonomySetting = new {
-        assetTypes = new[] {
-            "<String>"
-        },
-        facet = new {
-            count = 1234,
-            facet = "<facet>",
-            sort = new {},
-        },
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["keywords"] = "<keywords>",
+    ["offset"] = 1234,
+    ["limit"] = 1234,
+    ["filter"] = new Dictionary<string, object>(),
+    ["facets"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["count"] = 1234,
+["facet"] = "<facet>",
+["sort"] = new Dictionary<string, object>(),
+}
+},
+    ["taxonomySetting"] = new Dictionary<string, object>()
+    {
+        ["assetTypes"] = new List<object>()
+{
+"<assetTypes>"
+},
+        ["facet"] = null
+,
     },
-};
-
-Response response = await client.SearchAsync(RequestContent.Create(data));
+});
+Response response = await client.SearchAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("@search.count").ToString());
@@ -86,55 +86,54 @@ Console.WriteLine(result.GetProperty("value")[0].GetProperty("contact")[0].GetPr
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("contact")[0].GetProperty("info").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("contact")[0].GetProperty("contactType").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("assetType")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="Search(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call Search and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-var data = new {};
-
-Response response = client.Search(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.Search(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call Search with all request content, and how to parse the result.
+This sample shows how to call Search with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
-
-var data = new {
-    keywords = "<keywords>",
-    offset = 1234,
-    limit = 1234,
-    filter = new {},
-    facets = new[] {
-        new {
-            count = 1234,
-            facet = "<facet>",
-            sort = new {},
-        }
-    },
-    taxonomySetting = new {
-        assetTypes = new[] {
-            "<String>"
-        },
-        facet = new {
-            count = 1234,
-            facet = "<facet>",
-            sort = new {},
-        },
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["keywords"] = "<keywords>",
+    ["offset"] = 1234,
+    ["limit"] = 1234,
+    ["filter"] = new Dictionary<string, object>(),
+    ["facets"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["count"] = 1234,
+["facet"] = "<facet>",
+["sort"] = new Dictionary<string, object>(),
+}
+},
+    ["taxonomySetting"] = new Dictionary<string, object>()
+    {
+        ["assetTypes"] = new List<object>()
+{
+"<assetTypes>"
+},
+        ["facet"] = null
+,
     },
-};
-
-Response response = client.Search(RequestContent.Create(data));
+});
+Response response = client.Search(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("@search.count").ToString());
@@ -174,37 +173,35 @@ Console.WriteLine(result.GetProperty("value")[0].GetProperty("contact")[0].GetPr
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("contact")[0].GetProperty("info").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("contact")[0].GetProperty("contactType").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("assetType")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="SuggestAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call SuggestAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-var data = new {};
-
-Response response = await client.SuggestAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.SuggestAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call SuggestAsync with all request content, and how to parse the result.
+This sample shows how to call SuggestAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
-
-var data = new {
-    keywords = "<keywords>",
-    limit = 1234,
-    filter = new {},
-};
-
-Response response = await client.SuggestAsync(RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["keywords"] = "<keywords>",
+    ["limit"] = 1234,
+    ["filter"] = new Dictionary<string, object>(),
+});
+Response response = await client.SuggestAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("@search.score").ToString());
@@ -224,37 +221,35 @@ Console.WriteLine(result.GetProperty("value")[0].GetProperty("contact")[0].GetPr
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("contact")[0].GetProperty("info").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("contact")[0].GetProperty("contactType").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("assetType")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="Suggest(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call Suggest and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-var data = new {};
-
-Response response = client.Suggest(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.Suggest(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call Suggest with all request content, and how to parse the result.
+This sample shows how to call Suggest with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
-
-var data = new {
-    keywords = "<keywords>",
-    limit = 1234,
-    filter = new {},
-};
-
-Response response = client.Suggest(RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["keywords"] = "<keywords>",
+    ["limit"] = 1234,
+    ["filter"] = new Dictionary<string, object>(),
+});
+Response response = client.Suggest(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("@search.score").ToString());
@@ -274,38 +269,36 @@ Console.WriteLine(result.GetProperty("value")[0].GetProperty("contact")[0].GetPr
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("contact")[0].GetProperty("info").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("contact")[0].GetProperty("contactType").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("assetType")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="BrowseAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call BrowseAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-var data = new {};
-
-Response response = await client.BrowseAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.BrowseAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call BrowseAsync with all request content, and how to parse the result.
+This sample shows how to call BrowseAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
-
-var data = new {
-    entityType = "<entityType>",
-    path = "<path>",
-    limit = 1234,
-    offset = 1234,
-};
-
-Response response = await client.BrowseAsync(RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["entityType"] = "<entityType>",
+    ["path"] = "<path>",
+    ["limit"] = 1234,
+    ["offset"] = 1234,
+});
+Response response = await client.BrowseAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("@search.count").ToString());
@@ -319,38 +312,36 @@ Console.WriteLine(result.GetProperty("value")[0].GetProperty("owner")[0].GetProp
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("owner")[0].GetProperty("contactType").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("path").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("qualifiedName").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="Browse(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call Browse and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-var data = new {};
-
-Response response = client.Browse(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.Browse(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call Browse with all request content, and how to parse the result.
+This sample shows how to call Browse with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
-
-var data = new {
-    entityType = "<entityType>",
-    path = "<path>",
-    limit = 1234,
-    offset = 1234,
-};
-
-Response response = client.Browse(RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["entityType"] = "<entityType>",
+    ["path"] = "<path>",
+    ["limit"] = 1234,
+    ["offset"] = 1234,
+});
+Response response = client.Browse(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("@search.count").ToString());
@@ -364,78 +355,73 @@ Console.WriteLine(result.GetProperty("value")[0].GetProperty("owner")[0].GetProp
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("owner")[0].GetProperty("contactType").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("path").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("qualifiedName").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="AutoCompleteAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call AutoCompleteAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-var data = new {};
-
-Response response = await client.AutoCompleteAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.AutoCompleteAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call AutoCompleteAsync with all request content, and how to parse the result.
+This sample shows how to call AutoCompleteAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
-
-var data = new {
-    keywords = "<keywords>",
-    limit = 1234,
-    filter = new {},
-};
-
-Response response = await client.AutoCompleteAsync(RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["keywords"] = "<keywords>",
+    ["limit"] = 1234,
+    ["filter"] = new Dictionary<string, object>(),
+});
+Response response = await client.AutoCompleteAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("text").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("queryPlusText").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="AutoComplete(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call AutoComplete and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-var data = new {};
-
-Response response = client.AutoComplete(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.AutoComplete(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call AutoComplete with all request content, and how to parse the result.
+This sample shows how to call AutoComplete with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential);
-
-var data = new {
-    keywords = "<keywords>",
-    limit = 1234,
-    filter = new {},
-};
-
-Response response = client.AutoComplete(RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["keywords"] = "<keywords>",
+    ["limit"] = 1234,
+    ["filter"] = new Dictionary<string, object>(),
+});
+Response response = client.AutoComplete(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("text").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("queryPlusText").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewCollections.xml b/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewCollections.xml
index 5ab2d6479cef..ab3eac90b2c0 100644
--- a/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewCollections.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewCollections.xml
@@ -2,224 +2,165 @@
 <doc>
   <members>
     <member name="CreateOrUpdateEntityAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateEntityAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateEntityAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateEntityAsync("<collection>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateEntityAsync("<collection>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateEntityAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateEntityAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
-
-var data = new {
-    entity = new {
-        businessAttributes = new {
-            key = new {},
-        },
-        classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-        createTime = 123.45f,
-        createdBy = "<createdBy>",
-        customAttributes = new {
-            key = "<String>",
-        },
-        guid = "<guid>",
-        homeId = "<homeId>",
-        isIncomplete = true,
-        labels = new[] {
-            "<String>"
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["entity"] = new Dictionary<string, object>()
+    {
+        ["businessAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        meanings = new[] {
-            new {
-                confidence = 1234,
-                createdBy = "<createdBy>",
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DISCOVERED",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
+        ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+        ["createTime"] = 123.45F,
+        ["createdBy"] = "<createdBy>",
+        ["customAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = "<customAttributes>",
         },
-        provenanceType = 123.45f,
-        proxy = true,
-        relationshipAttributes = new {
-            key = new {},
+        ["guid"] = "<guid>",
+        ["homeId"] = "<homeId>",
+        ["isIncomplete"] = true,
+        ["labels"] = new List<object>()
+{
+"<labels>"
+},
+        ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+        ["provenanceType"] = 123.45F,
+        ["proxy"] = true,
+        ["relationshipAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        status = "ACTIVE",
-        updateTime = 123.45f,
-        updatedBy = "<updatedBy>",
-        version = 123.45f,
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
+        ["status"] = "ACTIVE",
+        ["updateTime"] = 123.45F,
+        ["updatedBy"] = "<updatedBy>",
+        ["version"] = 123.45F,
+        ["source"] = "<source>",
+        ["sourceDetails"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        contacts = new {
-            key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
+        ["contacts"] = new Dictionary<string, object>()
+        {
+            ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
         },
-        attributes = new {
-            key = new {},
+        ["attributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
+        ["typeName"] = "<typeName>",
+        ["lastModifiedTS"] = "<lastModifiedTS>",
     },
-    referredEntities = new {
-        key = new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
+    ["referredEntities"] = new Dictionary<string, object>()
+    {
+        ["key"] = null
+,
     },
-};
-
-Response response = await client.CreateOrUpdateEntityAsync("<collection>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateEntityAsync("<collection>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -228,8 +169,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -248,231 +189,171 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateEntity(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateEntity with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateEntity and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-var data = new {};
-
-Response response = client.CreateOrUpdateEntity("<collection>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdateEntity("<collection>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateEntity with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateEntity with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
-
-var data = new {
-    entity = new {
-        businessAttributes = new {
-            key = new {},
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["entity"] = new Dictionary<string, object>()
+    {
+        ["businessAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
+        ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+        ["createTime"] = 123.45F,
+        ["createdBy"] = "<createdBy>",
+        ["customAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = "<customAttributes>",
         },
-        createTime = 123.45f,
-        createdBy = "<createdBy>",
-        customAttributes = new {
-            key = "<String>",
+        ["guid"] = "<guid>",
+        ["homeId"] = "<homeId>",
+        ["isIncomplete"] = true,
+        ["labels"] = new List<object>()
+{
+"<labels>"
+},
+        ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+        ["provenanceType"] = 123.45F,
+        ["proxy"] = true,
+        ["relationshipAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        guid = "<guid>",
-        homeId = "<homeId>",
-        isIncomplete = true,
-        labels = new[] {
-            "<String>"
+        ["status"] = "ACTIVE",
+        ["updateTime"] = 123.45F,
+        ["updatedBy"] = "<updatedBy>",
+        ["version"] = 123.45F,
+        ["source"] = "<source>",
+        ["sourceDetails"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        meanings = new[] {
-            new {
-                confidence = 1234,
-                createdBy = "<createdBy>",
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DISCOVERED",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
+        ["contacts"] = new Dictionary<string, object>()
+        {
+            ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
         },
-        provenanceType = 123.45f,
-        proxy = true,
-        relationshipAttributes = new {
-            key = new {},
+        ["attributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        status = "ACTIVE",
-        updateTime = 123.45f,
-        updatedBy = "<updatedBy>",
-        version = 123.45f,
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        contacts = new {
-            key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
+        ["typeName"] = "<typeName>",
+        ["lastModifiedTS"] = "<lastModifiedTS>",
     },
-    referredEntities = new {
-        key = new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
+    ["referredEntities"] = new Dictionary<string, object>()
+    {
+        ["key"] = null
+,
     },
-};
-
-Response response = client.CreateOrUpdateEntity("<collection>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdateEntity("<collection>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -481,8 +362,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -501,233 +382,174 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateEntityInBulkAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateEntityInBulkAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateEntityInBulkAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-Response response = await client.CreateOrUpdateEntityInBulkAsync("<collection>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateEntityInBulkAsync("<collection>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateEntityInBulkAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateEntityInBulkAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
-
-var data = new {
-    entities = new[] {
-        new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    referredEntities = new {
-        key = new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["businessAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["customAttributes"] = new Dictionary<string, object>()
+{
+["key"] = "<customAttributes>",
+},
+["guid"] = "<guid>",
+["homeId"] = "<homeId>",
+["isIncomplete"] = true,
+["labels"] = new List<object>()
+{
+"<labels>"
+},
+["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["provenanceType"] = 123.45F,
+["proxy"] = true,
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["status"] = "ACTIVE",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["contacts"] = new Dictionary<string, object>()
+{
+["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["referredEntities"] = new Dictionary<string, object>()
+    {
+        ["key"] = null
+,
     },
-};
-
-Response response = await client.CreateOrUpdateEntityInBulkAsync("<collection>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateEntityInBulkAsync("<collection>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -736,8 +558,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -756,233 +578,174 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateEntityInBulk(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateEntityInBulk with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateEntityInBulk and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-var data = new {};
-
-Response response = client.CreateOrUpdateEntityInBulk("<collection>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdateEntityInBulk("<collection>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateEntityInBulk with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateEntityInBulk with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
-
-var data = new {
-    entities = new[] {
-        new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["businessAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["customAttributes"] = new Dictionary<string, object>()
+{
+["key"] = "<customAttributes>",
+},
+["guid"] = "<guid>",
+["homeId"] = "<homeId>",
+["isIncomplete"] = true,
+["labels"] = new List<object>()
+{
+"<labels>"
+},
+["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["provenanceType"] = 123.45F,
+["proxy"] = true,
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["status"] = "ACTIVE",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["contacts"] = new Dictionary<string, object>()
+{
+["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["referredEntities"] = new Dictionary<string, object>()
+    {
+        ["key"] = null
+,
     },
-    referredEntities = new {
-        key = new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-    },
-};
-
-Response response = client.CreateOrUpdateEntityInBulk("<collection>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdateEntityInBulk("<collection>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -991,8 +754,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1011,74 +774,73 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="MoveEntitiesToCollectionAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call MoveEntitiesToCollectionAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call MoveEntitiesToCollectionAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-Response response = await client.MoveEntitiesToCollectionAsync("<collection>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.MoveEntitiesToCollectionAsync("<collection>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call MoveEntitiesToCollectionAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call MoveEntitiesToCollectionAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
-
-var data = new {
-    entityGuids = new[] {
-        "<String>"
-    },
-};
-
-Response response = await client.MoveEntitiesToCollectionAsync("<collection>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["entityGuids"] = new List<object>()
+{
+"<entityGuids>"
+},
+});
+Response response = await client.MoveEntitiesToCollectionAsync("<collection>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1087,8 +849,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1107,74 +869,73 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="MoveEntitiesToCollection(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call MoveEntitiesToCollection with required parameters and parse the result.
+      <example>
+This sample shows how to call MoveEntitiesToCollection and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-Response response = client.MoveEntitiesToCollection("<collection>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.MoveEntitiesToCollection("<collection>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call MoveEntitiesToCollection with all parameters and request content, and how to parse the result.
+This sample shows how to call MoveEntitiesToCollection with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
-
-var data = new {
-    entityGuids = new[] {
-        "<String>"
-    },
-};
-
-Response response = client.MoveEntitiesToCollection("<collection>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["entityGuids"] = new List<object>()
+{
+"<entityGuids>"
+},
+});
+Response response = client.MoveEntitiesToCollection("<collection>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1183,8 +944,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1203,11 +964,10 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewEntities.xml b/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewEntities.xml
index 106a5804c668..f7a261323265 100644
--- a/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewEntities.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewEntities.xml
@@ -2,224 +2,165 @@
 <doc>
   <members>
     <member name="CreateOrUpdateAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {
-    entity = new {
-        businessAttributes = new {
-            key = new {},
-        },
-        classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-        createTime = 123.45f,
-        createdBy = "<createdBy>",
-        customAttributes = new {
-            key = "<String>",
-        },
-        guid = "<guid>",
-        homeId = "<homeId>",
-        isIncomplete = true,
-        labels = new[] {
-            "<String>"
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["entity"] = new Dictionary<string, object>()
+    {
+        ["businessAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        meanings = new[] {
-            new {
-                confidence = 1234,
-                createdBy = "<createdBy>",
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DISCOVERED",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
+        ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+        ["createTime"] = 123.45F,
+        ["createdBy"] = "<createdBy>",
+        ["customAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = "<customAttributes>",
         },
-        provenanceType = 123.45f,
-        proxy = true,
-        relationshipAttributes = new {
-            key = new {},
+        ["guid"] = "<guid>",
+        ["homeId"] = "<homeId>",
+        ["isIncomplete"] = true,
+        ["labels"] = new List<object>()
+{
+"<labels>"
+},
+        ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+        ["provenanceType"] = 123.45F,
+        ["proxy"] = true,
+        ["relationshipAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        status = "ACTIVE",
-        updateTime = 123.45f,
-        updatedBy = "<updatedBy>",
-        version = 123.45f,
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
+        ["status"] = "ACTIVE",
+        ["updateTime"] = 123.45F,
+        ["updatedBy"] = "<updatedBy>",
+        ["version"] = 123.45F,
+        ["source"] = "<source>",
+        ["sourceDetails"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        contacts = new {
-            key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
+        ["contacts"] = new Dictionary<string, object>()
+        {
+            ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
         },
-        attributes = new {
-            key = new {},
+        ["attributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
+        ["typeName"] = "<typeName>",
+        ["lastModifiedTS"] = "<lastModifiedTS>",
     },
-    referredEntities = new {
-        key = new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
+    ["referredEntities"] = new Dictionary<string, object>()
+    {
+        ["key"] = null
+,
     },
-};
-
-Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -228,8 +169,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -248,231 +189,171 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.CreateOrUpdate(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdate(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {
-    entity = new {
-        businessAttributes = new {
-            key = new {},
-        },
-        classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-        createTime = 123.45f,
-        createdBy = "<createdBy>",
-        customAttributes = new {
-            key = "<String>",
-        },
-        guid = "<guid>",
-        homeId = "<homeId>",
-        isIncomplete = true,
-        labels = new[] {
-            "<String>"
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["entity"] = new Dictionary<string, object>()
+    {
+        ["businessAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        meanings = new[] {
-            new {
-                confidence = 1234,
-                createdBy = "<createdBy>",
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DISCOVERED",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
+        ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+        ["createTime"] = 123.45F,
+        ["createdBy"] = "<createdBy>",
+        ["customAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = "<customAttributes>",
         },
-        provenanceType = 123.45f,
-        proxy = true,
-        relationshipAttributes = new {
-            key = new {},
+        ["guid"] = "<guid>",
+        ["homeId"] = "<homeId>",
+        ["isIncomplete"] = true,
+        ["labels"] = new List<object>()
+{
+"<labels>"
+},
+        ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+        ["provenanceType"] = 123.45F,
+        ["proxy"] = true,
+        ["relationshipAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        status = "ACTIVE",
-        updateTime = 123.45f,
-        updatedBy = "<updatedBy>",
-        version = 123.45f,
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
+        ["status"] = "ACTIVE",
+        ["updateTime"] = 123.45F,
+        ["updatedBy"] = "<updatedBy>",
+        ["version"] = 123.45F,
+        ["source"] = "<source>",
+        ["sourceDetails"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        contacts = new {
-            key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
+        ["contacts"] = new Dictionary<string, object>()
+        {
+            ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
         },
-        attributes = new {
-            key = new {},
+        ["attributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
+        ["typeName"] = "<typeName>",
+        ["lastModifiedTS"] = "<lastModifiedTS>",
     },
-    referredEntities = new {
-        key = new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
+    ["referredEntities"] = new Dictionary<string, object>()
+    {
+        ["key"] = null
+,
     },
-};
-
-Response response = client.CreateOrUpdate(RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdate(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -481,8 +362,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -501,24 +382,43 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetByGuidsAsync(IEnumerable{string},bool?,bool?,IEnumerable{string},RequestContext)">
-<example>
-This sample shows how to call GetByGuidsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetByGuidsAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = await client.GetByGuidsAsync(new List<string>()
+{
+"<guids>"
+}, null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetByGuidsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.GetByGuidsAsync(new String[]{"<guids>"}, true, true, new String[]{"<excludeRelationshipTypes>"}, new RequestContext());
+Response response = await client.GetByGuidsAsync(new List<string>()
+{
+"<guids>"
+}, true, true, new List<string>()
+{
+"<excludeRelationshipTypes>"
+}, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -526,13 +426,13 @@ Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createTime").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("homeId").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("isIncomplete").ToString());
@@ -549,76 +449,95 @@ Console.WriteLine(result.GetProperty("entities")[0].GetProperty("meanings")[0].G
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("provenanceType").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+]]></code></example>
     </member>
     <member name="GetByGuids(IEnumerable{string},bool?,bool?,IEnumerable{string},RequestContext)">
-<example>
-This sample shows how to call GetByGuids with required parameters and parse the result.
+      <example>
+This sample shows how to call GetByGuids and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.GetByGuids(new String[]{"<guids>"}, true, true, new String[]{"<excludeRelationshipTypes>"}, new RequestContext());
+Response response = client.GetByGuids(new List<string>()
+{
+"<guids>"
+}, null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetByGuids with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = client.GetByGuids(new List<string>()
+{
+"<guids>"
+}, true, true, new List<string>()
+{
+"<excludeRelationshipTypes>"
+}, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -626,13 +545,13 @@ Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createTime").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("homeId").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("isIncomplete").ToString());
@@ -649,285 +568,226 @@ Console.WriteLine(result.GetProperty("entities")[0].GetProperty("meanings")[0].G
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("provenanceType").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+]]></code></example>
     </member>
     <member name="CreateOrUpdateEntitiesAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateEntitiesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateEntitiesAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateEntitiesAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateEntitiesAsync with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateEntitiesAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {
-    entities = new[] {
-        new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    referredEntities = new {
-        key = new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["businessAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["customAttributes"] = new Dictionary<string, object>()
+{
+["key"] = "<customAttributes>",
+},
+["guid"] = "<guid>",
+["homeId"] = "<homeId>",
+["isIncomplete"] = true,
+["labels"] = new List<object>()
+{
+"<labels>"
+},
+["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["provenanceType"] = 123.45F,
+["proxy"] = true,
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["status"] = "ACTIVE",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["contacts"] = new Dictionary<string, object>()
+{
+["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["referredEntities"] = new Dictionary<string, object>()
+    {
+        ["key"] = null
+,
     },
-};
-
-Response response = await client.CreateOrUpdateEntitiesAsync(RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateEntitiesAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -936,8 +796,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -956,233 +816,174 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateEntities(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateEntities and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.CreateOrUpdateEntities(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdateEntities(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateEntities with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateEntities with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {
-    entities = new[] {
-        new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    referredEntities = new {
-        key = new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["businessAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["customAttributes"] = new Dictionary<string, object>()
+{
+["key"] = "<customAttributes>",
+},
+["guid"] = "<guid>",
+["homeId"] = "<homeId>",
+["isIncomplete"] = true,
+["labels"] = new List<object>()
+{
+"<labels>"
+},
+["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["provenanceType"] = 123.45F,
+["proxy"] = true,
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["status"] = "ACTIVE",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["contacts"] = new Dictionary<string, object>()
+{
+["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["referredEntities"] = new Dictionary<string, object>()
+    {
+        ["key"] = null
+,
     },
-};
-
-Response response = client.CreateOrUpdateEntities(RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdateEntities(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1191,8 +992,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1211,55 +1012,71 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteByGuidsAsync(IEnumerable{string},RequestContext)">
-<example>
-This sample shows how to call DeleteByGuidsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteByGuidsAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = await client.DeleteByGuidsAsync(new List<string>()
+{
+"<guids>"
+}, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteByGuidsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.DeleteByGuidsAsync(new String[]{"<guids>"}, new RequestContext());
+Response response = await client.DeleteByGuidsAsync(new List<string>()
+{
+"<guids>"
+}, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1268,8 +1085,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1288,55 +1105,71 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteByGuids(IEnumerable{string},RequestContext)">
-<example>
-This sample shows how to call DeleteByGuids with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteByGuids and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = client.DeleteByGuids(new List<string>()
+{
+"<guids>"
+}, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteByGuids with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.DeleteByGuids(new String[]{"<guids>"}, new RequestContext());
+Response response = client.DeleteByGuids(new List<string>()
+{
+"<guids>"
+}, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1345,8 +1178,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1365,126 +1198,144 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="AddClassificationAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call AddClassificationAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {};
-
-Response response = await client.AddClassificationAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.AddClassificationAsync(content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call AddClassificationAsync with all request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {
-    classification = new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["classification"] = new Dictionary<string, object>()
+    {
+        ["entityGuid"] = "<entityGuid>",
+        ["entityStatus"] = "ACTIVE",
+        ["removePropagationsOnEntityDelete"] = true,
+        ["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+        ["source"] = "<source>",
+        ["sourceDetails"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        attributes = new {
-            key = new {},
+        ["attributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
+        ["typeName"] = "<typeName>",
+        ["lastModifiedTS"] = "<lastModifiedTS>",
     },
-    entityGuids = new[] {
-        "<String>"
-    },
-};
-
-Response response = await client.AddClassificationAsync(RequestContent.Create(data));
+    ["entityGuids"] = new List<object>()
+{
+"<entityGuids>"
+},
+});
+Response response = await client.AddClassificationAsync(content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="AddClassification(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call AddClassification.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {};
-
-Response response = client.AddClassification(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.AddClassification(content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call AddClassification with all request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {
-    classification = new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["classification"] = new Dictionary<string, object>()
+    {
+        ["entityGuid"] = "<entityGuid>",
+        ["entityStatus"] = "ACTIVE",
+        ["removePropagationsOnEntityDelete"] = true,
+        ["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+        ["source"] = "<source>",
+        ["sourceDetails"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        attributes = new {
-            key = new {},
+        ["attributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
+        ["typeName"] = "<typeName>",
+        ["lastModifiedTS"] = "<lastModifiedTS>",
     },
-    entityGuids = new[] {
-        "<String>"
-    },
-};
-
-Response response = client.AddClassification(RequestContent.Create(data));
+    ["entityGuids"] = new List<object>()
+{
+"<entityGuids>"
+},
+});
+Response response = client.AddClassification(content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetByGuidAsync(string,bool?,bool?,RequestContext)">
-<example>
-This sample shows how to call GetByGuidAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetByGuidAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = await client.GetByGuidAsync("<guid>", null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetByGuidAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.GetByGuidAsync("<guid>", true, true, new RequestContext());
+Response response = await client.GetByGuidAsync("<guid>", true, true, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -1492,13 +1343,13 @@ Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0]
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("createTime").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("homeId").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("isIncomplete").ToString());
@@ -1515,76 +1366,86 @@ Console.WriteLine(result.GetProperty("entity").GetProperty("meanings")[0].GetPro
 Console.WriteLine(result.GetProperty("entity").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("provenanceType").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+]]></code></example>
     </member>
     <member name="GetByGuid(string,bool?,bool?,RequestContext)">
-<example>
-This sample shows how to call GetByGuid with required parameters and parse the result.
+      <example>
+This sample shows how to call GetByGuid and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = client.GetByGuid("<guid>", null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetByGuid with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.GetByGuid("<guid>", true, true, new RequestContext());
+Response response = client.GetByGuid("<guid>", true, true, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -1592,13 +1453,13 @@ Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0]
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("createTime").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("homeId").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("isIncomplete").ToString());
@@ -1615,109 +1476,119 @@ Console.WriteLine(result.GetProperty("entity").GetProperty("meanings")[0].GetPro
 Console.WriteLine(result.GetProperty("entity").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("provenanceType").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+]]></code></example>
     </member>
     <member name="PartialUpdateEntityAttributeByGuidAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call PartialUpdateEntityAttributeByGuidAsync with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call PartialUpdateEntityAttributeByGuidAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {};
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.PartialUpdateEntityAttributeByGuidAsync("<guid>", "<name>", content);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call PartialUpdateEntityAttributeByGuidAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.PartialUpdateEntityAttributeByGuidAsync("<guid>", "<name>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.PartialUpdateEntityAttributeByGuidAsync("<guid>", "<name>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1726,8 +1597,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1746,57 +1617,67 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="PartialUpdateEntityAttributeByGuid(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call PartialUpdateEntityAttributeByGuid with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call PartialUpdateEntityAttributeByGuid and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {};
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.PartialUpdateEntityAttributeByGuid("<guid>", "<name>", content);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call PartialUpdateEntityAttributeByGuid with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.PartialUpdateEntityAttributeByGuid("<guid>", "<name>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.PartialUpdateEntityAttributeByGuid("<guid>", "<name>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1805,8 +1686,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1825,55 +1706,65 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteByGuidAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteByGuidAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteByGuidAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.DeleteByGuidAsync("<guid>", new RequestContext());
+Response response = await client.DeleteByGuidAsync("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteByGuidAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = await client.DeleteByGuidAsync("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1882,8 +1773,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1902,55 +1793,65 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteByGuid(string,RequestContext)">
-<example>
-This sample shows how to call DeleteByGuid with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteByGuid and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.DeleteByGuid("<guid>", new RequestContext());
+Response response = client.DeleteByGuid("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteByGuid with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = client.DeleteByGuid("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1959,8 +1860,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1979,21 +1880,31 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetClassificationAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetClassificationAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetClassificationAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = await client.GetClassificationAsync("<guid>", "<classificationName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetClassificationAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.GetClassificationAsync("<guid>", "<classificationName>", new RequestContext());
+Response response = await client.GetClassificationAsync("<guid>", "<classificationName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("entityGuid").ToString());
@@ -2003,22 +1914,32 @@ Console.WriteLine(result.GetProperty("validityPeriods")[0].GetProperty("endTime"
 Console.WriteLine(result.GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetClassification(string,string,RequestContext)">
-<example>
-This sample shows how to call GetClassification with required parameters and parse the result.
+      <example>
+This sample shows how to call GetClassification and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.GetClassification("<guid>", "<classificationName>", new RequestContext());
+Response response = client.GetClassification("<guid>", "<classificationName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetClassification with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = client.GetClassification("<guid>", "<classificationName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("entityGuid").ToString());
@@ -2028,48 +1949,74 @@ Console.WriteLine(result.GetProperty("validityPeriods")[0].GetProperty("endTime"
 Console.WriteLine(result.GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteClassificationAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteClassificationAsync with required parameters.
+      <example>
+This sample shows how to call DeleteClassificationAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
 Response response = await client.DeleteClassificationAsync("<guid>", "<classificationName>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteClassificationAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = await client.DeleteClassificationAsync("<guid>", "<classificationName>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteClassification(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteClassification with required parameters.
+      <example>
+This sample shows how to call DeleteClassification.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
 Response response = client.DeleteClassification("<guid>", "<classificationName>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteClassification with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = client.DeleteClassification("<guid>", "<classificationName>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetClassificationsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetClassificationsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetClassificationsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.GetClassificationsAsync("<guid>", new RequestContext());
+Response response = await client.GetClassificationsAsync("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetClassificationsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = await client.GetClassificationsAsync("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("list")[0].ToString());
@@ -2078,18 +2025,28 @@ Console.WriteLine(result.GetProperty("sortBy").ToString());
 Console.WriteLine(result.GetProperty("sortType").ToString());
 Console.WriteLine(result.GetProperty("startIndex").ToString());
 Console.WriteLine(result.GetProperty("totalCount").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetClassifications(string,RequestContext)">
-<example>
-This sample shows how to call GetClassifications with required parameters and parse the result.
+      <example>
+This sample shows how to call GetClassifications and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = client.GetClassifications("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetClassifications with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.GetClassifications("<guid>", new RequestContext());
+Response response = client.GetClassifications("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("list")[0].ToString());
@@ -2098,169 +2055,247 @@ Console.WriteLine(result.GetProperty("sortBy").ToString());
 Console.WriteLine(result.GetProperty("sortType").ToString());
 Console.WriteLine(result.GetProperty("startIndex").ToString());
 Console.WriteLine(result.GetProperty("totalCount").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="AddClassificationsAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call AddClassificationsAsync with required parameters and request content.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+      <example>
+This sample shows how to call AddClassificationsAsync.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.AddClassificationsAsync("<guid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = await client.AddClassificationsAsync("<guid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call AddClassificationsAsync with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+Response response = await client.AddClassificationsAsync("<guid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="AddClassifications(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call AddClassifications with required parameters and request content.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+      <example>
+This sample shows how to call AddClassifications.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.AddClassifications("<guid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = client.AddClassifications("<guid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call AddClassifications with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+Response response = client.AddClassifications("<guid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="UpdateClassificationsAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateClassificationsAsync with required parameters and request content.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+      <example>
+This sample shows how to call UpdateClassificationsAsync.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.UpdateClassificationsAsync("<guid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = await client.UpdateClassificationsAsync("<guid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call UpdateClassificationsAsync with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+Response response = await client.UpdateClassificationsAsync("<guid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="UpdateClassifications(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateClassifications with required parameters and request content.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+      <example>
+This sample shows how to call UpdateClassifications.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.UpdateClassifications("<guid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = client.UpdateClassifications("<guid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call UpdateClassifications with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+Response response = client.UpdateClassifications("<guid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetByUniqueAttributesAsync(string,bool?,bool?,string,RequestContext)">
-<example>
-This sample shows how to call GetByUniqueAttributesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetByUniqueAttributesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.GetByUniqueAttributesAsync("<typeName>", true, true, "<attrQualifiedName>", new RequestContext());
+Response response = await client.GetByUniqueAttributesAsync("<typeName>", null, null, null, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetByUniqueAttributesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = await client.GetByUniqueAttributesAsync("<typeName>", true, true, "<attrQualifiedName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -2268,13 +2303,13 @@ Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0]
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("createTime").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("homeId").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("isIncomplete").ToString());
@@ -2291,76 +2326,86 @@ Console.WriteLine(result.GetProperty("entity").GetProperty("meanings")[0].GetPro
 Console.WriteLine(result.GetProperty("entity").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("provenanceType").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+]]></code></example>
     </member>
     <member name="GetByUniqueAttributes(string,bool?,bool?,string,RequestContext)">
-<example>
-This sample shows how to call GetByUniqueAttributes with required parameters and parse the result.
+      <example>
+This sample shows how to call GetByUniqueAttributes and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.GetByUniqueAttributes("<typeName>", true, true, "<attrQualifiedName>", new RequestContext());
+Response response = client.GetByUniqueAttributes("<typeName>", null, null, null, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetByUniqueAttributes with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = client.GetByUniqueAttributes("<typeName>", true, true, "<attrQualifiedName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -2368,13 +2413,13 @@ Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0]
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("createTime").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("homeId").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("isIncomplete").ToString());
@@ -2391,283 +2436,223 @@ Console.WriteLine(result.GetProperty("entity").GetProperty("meanings")[0].GetPro
 Console.WriteLine(result.GetProperty("entity").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("provenanceType").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entity").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+]]></code></example>
     </member>
     <member name="PartialUpdateEntityByUniqueAttributesAsync(string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call PartialUpdateEntityByUniqueAttributesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call PartialUpdateEntityByUniqueAttributesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.PartialUpdateEntityByUniqueAttributesAsync("<typeName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.PartialUpdateEntityByUniqueAttributesAsync("<typeName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call PartialUpdateEntityByUniqueAttributesAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call PartialUpdateEntityByUniqueAttributesAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {
-    entity = new {
-        businessAttributes = new {
-            key = new {},
-        },
-        classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-        createTime = 123.45f,
-        createdBy = "<createdBy>",
-        customAttributes = new {
-            key = "<String>",
-        },
-        guid = "<guid>",
-        homeId = "<homeId>",
-        isIncomplete = true,
-        labels = new[] {
-            "<String>"
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["entity"] = new Dictionary<string, object>()
+    {
+        ["businessAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        meanings = new[] {
-            new {
-                confidence = 1234,
-                createdBy = "<createdBy>",
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DISCOVERED",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
+        ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+        ["createTime"] = 123.45F,
+        ["createdBy"] = "<createdBy>",
+        ["customAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = "<customAttributes>",
         },
-        provenanceType = 123.45f,
-        proxy = true,
-        relationshipAttributes = new {
-            key = new {},
+        ["guid"] = "<guid>",
+        ["homeId"] = "<homeId>",
+        ["isIncomplete"] = true,
+        ["labels"] = new List<object>()
+{
+"<labels>"
+},
+        ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+        ["provenanceType"] = 123.45F,
+        ["proxy"] = true,
+        ["relationshipAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        status = "ACTIVE",
-        updateTime = 123.45f,
-        updatedBy = "<updatedBy>",
-        version = 123.45f,
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
+        ["status"] = "ACTIVE",
+        ["updateTime"] = 123.45F,
+        ["updatedBy"] = "<updatedBy>",
+        ["version"] = 123.45F,
+        ["source"] = "<source>",
+        ["sourceDetails"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        contacts = new {
-            key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
+        ["contacts"] = new Dictionary<string, object>()
+        {
+            ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
         },
-        attributes = new {
-            key = new {},
+        ["attributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
+        ["typeName"] = "<typeName>",
+        ["lastModifiedTS"] = "<lastModifiedTS>",
     },
-    referredEntities = new {
-        key = new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
+    ["referredEntities"] = new Dictionary<string, object>()
+    {
+        ["key"] = null
+,
     },
-};
-
-Response response = await client.PartialUpdateEntityByUniqueAttributesAsync("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+});
+Response response = await client.PartialUpdateEntityByUniqueAttributesAsync("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -2676,8 +2661,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -2696,231 +2681,171 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="PartialUpdateEntityByUniqueAttributes(string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call PartialUpdateEntityByUniqueAttributes with required parameters and parse the result.
+      <example>
+This sample shows how to call PartialUpdateEntityByUniqueAttributes and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.PartialUpdateEntityByUniqueAttributes("<typeName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.PartialUpdateEntityByUniqueAttributes("<typeName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call PartialUpdateEntityByUniqueAttributes with all parameters and request content, and how to parse the result.
+This sample shows how to call PartialUpdateEntityByUniqueAttributes with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {
-    entity = new {
-        businessAttributes = new {
-            key = new {},
-        },
-        classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-        createTime = 123.45f,
-        createdBy = "<createdBy>",
-        customAttributes = new {
-            key = "<String>",
-        },
-        guid = "<guid>",
-        homeId = "<homeId>",
-        isIncomplete = true,
-        labels = new[] {
-            "<String>"
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["entity"] = new Dictionary<string, object>()
+    {
+        ["businessAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        meanings = new[] {
-            new {
-                confidence = 1234,
-                createdBy = "<createdBy>",
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DISCOVERED",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
+        ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+        ["createTime"] = 123.45F,
+        ["createdBy"] = "<createdBy>",
+        ["customAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = "<customAttributes>",
         },
-        provenanceType = 123.45f,
-        proxy = true,
-        relationshipAttributes = new {
-            key = new {},
+        ["guid"] = "<guid>",
+        ["homeId"] = "<homeId>",
+        ["isIncomplete"] = true,
+        ["labels"] = new List<object>()
+{
+"<labels>"
+},
+        ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+        ["provenanceType"] = 123.45F,
+        ["proxy"] = true,
+        ["relationshipAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        status = "ACTIVE",
-        updateTime = 123.45f,
-        updatedBy = "<updatedBy>",
-        version = 123.45f,
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
+        ["status"] = "ACTIVE",
+        ["updateTime"] = 123.45F,
+        ["updatedBy"] = "<updatedBy>",
+        ["version"] = 123.45F,
+        ["source"] = "<source>",
+        ["sourceDetails"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        contacts = new {
-            key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
+        ["contacts"] = new Dictionary<string, object>()
+        {
+            ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
         },
-        attributes = new {
-            key = new {},
+        ["attributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
+        ["typeName"] = "<typeName>",
+        ["lastModifiedTS"] = "<lastModifiedTS>",
     },
-    referredEntities = new {
-        key = new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
+    ["referredEntities"] = new Dictionary<string, object>()
+    {
+        ["key"] = null
+,
     },
-};
-
-Response response = client.PartialUpdateEntityByUniqueAttributes("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+});
+Response response = client.PartialUpdateEntityByUniqueAttributes("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -2929,8 +2854,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -2949,55 +2874,65 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteByUniqueAttributeAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteByUniqueAttributeAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteByUniqueAttributeAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = await client.DeleteByUniqueAttributeAsync("<typeName>", null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteByUniqueAttributeAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.DeleteByUniqueAttributeAsync("<typeName>", "<attrQualifiedName>", new RequestContext());
+Response response = await client.DeleteByUniqueAttributeAsync("<typeName>", "<attrQualifiedName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -3006,8 +2941,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -3026,55 +2961,65 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteByUniqueAttribute(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteByUniqueAttribute with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteByUniqueAttribute and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = client.DeleteByUniqueAttribute("<typeName>", null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteByUniqueAttribute with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.DeleteByUniqueAttribute("<typeName>", "<attrQualifiedName>", new RequestContext());
+Response response = client.DeleteByUniqueAttribute("<typeName>", "<attrQualifiedName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -3083,8 +3028,8 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("c
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -3103,448 +3048,496 @@ Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("m
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteClassificationByUniqueAttributeAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteClassificationByUniqueAttributeAsync with required parameters.
+      <example>
+This sample shows how to call DeleteClassificationByUniqueAttributeAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
 Response response = await client.DeleteClassificationByUniqueAttributeAsync("<typeName>", "<classificationName>");
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call DeleteClassificationByUniqueAttributeAsync with all parameters.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.DeleteClassificationByUniqueAttributeAsync("<typeName>", "<classificationName>", "<attrQualifiedName>");
+Response response = await client.DeleteClassificationByUniqueAttributeAsync("<typeName>", "<classificationName>", attrQualifiedName: "<attrQualifiedName>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteClassificationByUniqueAttribute(string,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteClassificationByUniqueAttribute with required parameters.
+      <example>
+This sample shows how to call DeleteClassificationByUniqueAttribute.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
 Response response = client.DeleteClassificationByUniqueAttribute("<typeName>", "<classificationName>");
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call DeleteClassificationByUniqueAttribute with all parameters.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.DeleteClassificationByUniqueAttribute("<typeName>", "<classificationName>", "<attrQualifiedName>");
+Response response = client.DeleteClassificationByUniqueAttribute("<typeName>", "<classificationName>", attrQualifiedName: "<attrQualifiedName>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="AddClassificationsByUniqueAttributeAsync(string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call AddClassificationsByUniqueAttributeAsync with required parameters and request content.
+      <example>
+This sample shows how to call AddClassificationsByUniqueAttributeAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new[] {
-    new {}
-};
-
-Response response = await client.AddClassificationsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = await client.AddClassificationsByUniqueAttributeAsync("<typeName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call AddClassificationsByUniqueAttributeAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.AddClassificationsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+Response response = await client.AddClassificationsByUniqueAttributeAsync("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="AddClassificationsByUniqueAttribute(string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call AddClassificationsByUniqueAttribute with required parameters and request content.
+      <example>
+This sample shows how to call AddClassificationsByUniqueAttribute.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    new {}
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.AddClassificationsByUniqueAttribute("<typeName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = client.AddClassificationsByUniqueAttribute("<typeName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call AddClassificationsByUniqueAttribute with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.AddClassificationsByUniqueAttribute("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+Response response = client.AddClassificationsByUniqueAttribute("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateClassificationsByUniqueAttributeAsync(string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call UpdateClassificationsByUniqueAttributeAsync with required parameters and request content.
+      <example>
+This sample shows how to call UpdateClassificationsByUniqueAttributeAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    new {}
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.UpdateClassificationsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = await client.UpdateClassificationsByUniqueAttributeAsync("<typeName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call UpdateClassificationsByUniqueAttributeAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.UpdateClassificationsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+Response response = await client.UpdateClassificationsByUniqueAttributeAsync("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateClassificationsByUniqueAttribute(string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call UpdateClassificationsByUniqueAttribute with required parameters and request content.
+      <example>
+This sample shows how to call UpdateClassificationsByUniqueAttribute.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    new {}
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.UpdateClassificationsByUniqueAttribute("<typeName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = client.UpdateClassificationsByUniqueAttribute("<typeName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call UpdateClassificationsByUniqueAttribute with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.UpdateClassificationsByUniqueAttribute("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+Response response = client.UpdateClassificationsByUniqueAttribute("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="SetClassificationsAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call SetClassificationsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.SetClassificationsAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.SetClassificationsAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].ToString());
 ]]></code>
-This sample shows how to call SetClassificationsAsync with all request content, and how to parse the result.
+This sample shows how to call SetClassificationsAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {
-    guidHeaderMap = new {
-        key = new {
-            classificationNames = new[] {
-                "<String>"
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            displayText = "<displayText>",
-            guid = "<guid>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meaningNames = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            status = "ACTIVE",
-            attributes = new {
-                key = new {},
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["guidHeaderMap"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["classificationNames"] = new List<object>()
+{
+"<classificationNames>"
+},
+            ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+            ["displayText"] = "<displayText>",
+            ["guid"] = "<guid>",
+            ["isIncomplete"] = true,
+            ["labels"] = new List<object>()
+{
+"<labels>"
+},
+            ["meaningNames"] = new List<object>()
+{
+"<meaningNames>"
+},
+            ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+            ["status"] = "ACTIVE",
+            ["attributes"] = new Dictionary<string, object>()
+            {
+                ["key"] = new Dictionary<string, object>(),
             },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
+            ["typeName"] = "<typeName>",
+            ["lastModifiedTS"] = "<lastModifiedTS>",
         },
     },
-};
-
-Response response = await client.SetClassificationsAsync(RequestContent.Create(data));
+});
+Response response = await client.SetClassificationsAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="SetClassifications(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call SetClassifications and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.SetClassifications(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.SetClassifications(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].ToString());
 ]]></code>
-This sample shows how to call SetClassifications with all request content, and how to parse the result.
+This sample shows how to call SetClassifications with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {
-    guidHeaderMap = new {
-        key = new {
-            classificationNames = new[] {
-                "<String>"
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            displayText = "<displayText>",
-            guid = "<guid>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meaningNames = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            status = "ACTIVE",
-            attributes = new {
-                key = new {},
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["guidHeaderMap"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["classificationNames"] = new List<object>()
+{
+"<classificationNames>"
+},
+            ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+            ["displayText"] = "<displayText>",
+            ["guid"] = "<guid>",
+            ["isIncomplete"] = true,
+            ["labels"] = new List<object>()
+{
+"<labels>"
+},
+            ["meaningNames"] = new List<object>()
+{
+"<meaningNames>"
+},
+            ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+            ["status"] = "ACTIVE",
+            ["attributes"] = new Dictionary<string, object>()
+            {
+                ["key"] = new Dictionary<string, object>(),
             },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
+            ["typeName"] = "<typeName>",
+            ["lastModifiedTS"] = "<lastModifiedTS>",
         },
     },
-};
-
-Response response = client.SetClassifications(RequestContent.Create(data));
+});
+Response response = client.SetClassifications(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetEntitiesByUniqueAttributesAsync(string,bool?,bool?,string,RequestContext)">
-<example>
-This sample shows how to call GetEntitiesByUniqueAttributesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEntitiesByUniqueAttributesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.GetEntitiesByUniqueAttributesAsync("<typeName>", true, true, "<attrNQualifiedName>", new RequestContext());
+Response response = await client.GetEntitiesByUniqueAttributesAsync("<typeName>", null, null, null, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetEntitiesByUniqueAttributesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = await client.GetEntitiesByUniqueAttributesAsync("<typeName>", true, true, "<attrNQualifiedName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -3552,13 +3545,13 @@ Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createTime").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("homeId").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("isIncomplete").ToString());
@@ -3575,76 +3568,86 @@ Console.WriteLine(result.GetProperty("entities")[0].GetProperty("meanings")[0].G
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("provenanceType").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+]]></code></example>
     </member>
     <member name="GetEntitiesByUniqueAttributes(string,bool?,bool?,string,RequestContext)">
-<example>
-This sample shows how to call GetEntitiesByUniqueAttributes with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEntitiesByUniqueAttributes and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.GetEntitiesByUniqueAttributes("<typeName>", true, true, "<attrNQualifiedName>", new RequestContext());
+Response response = client.GetEntitiesByUniqueAttributes("<typeName>", null, null, null, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetEntitiesByUniqueAttributes with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = client.GetEntitiesByUniqueAttributes("<typeName>", true, true, "<attrNQualifiedName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -3652,13 +3655,13 @@ Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createTime").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("homeId").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("isIncomplete").ToString());
@@ -3675,73 +3678,83 @@ Console.WriteLine(result.GetProperty("entities")[0].GetProperty("meanings")[0].G
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("provenanceType").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entities")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+]]></code></example>
     </member>
     <member name="GetHeaderAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetHeaderAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetHeaderAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.GetHeaderAsync("<guid>", new RequestContext());
+Response response = await client.GetHeaderAsync("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetHeaderAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = await client.GetHeaderAsync("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("classificationNames")[0].ToString());
@@ -3752,8 +3765,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("displayText").ToString());
@@ -3772,21 +3785,31 @@ Console.WriteLine(result.GetProperty("meanings")[0].GetProperty("status").ToStri
 Console.WriteLine(result.GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetHeader(string,RequestContext)">
-<example>
-This sample shows how to call GetHeader with required parameters and parse the result.
+      <example>
+This sample shows how to call GetHeader and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = client.GetHeader("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetHeader with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.GetHeader("<guid>", new RequestContext());
+Response response = client.GetHeader("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("classificationNames")[0].ToString());
@@ -3797,8 +3820,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("displayText").ToString());
@@ -3817,223 +3840,307 @@ Console.WriteLine(result.GetProperty("meanings")[0].GetProperty("status").ToStri
 Console.WriteLine(result.GetProperty("meanings")[0].GetProperty("steward").ToString());
 Console.WriteLine(result.GetProperty("meanings")[0].GetProperty("termGuid").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteBusinessMetadataAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DeleteBusinessMetadataAsync with required parameters and request content.
+      <example>
+This sample shows how to call DeleteBusinessMetadataAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {
-    key = new {},
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.DeleteBusinessMetadataAsync("<guid>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.DeleteBusinessMetadataAsync("<guid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteBusinessMetadataAsync with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = new Dictionary<string, object>(),
+});
+Response response = await client.DeleteBusinessMetadataAsync("<guid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteBusinessMetadata(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DeleteBusinessMetadata with required parameters and request content.
+      <example>
+This sample shows how to call DeleteBusinessMetadata.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {
-    key = new {},
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.DeleteBusinessMetadata("<guid>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.DeleteBusinessMetadata("<guid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteBusinessMetadata with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = new Dictionary<string, object>(),
+});
+Response response = client.DeleteBusinessMetadata("<guid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="AddOrUpdateBusinessMetadataAsync(string,RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call AddOrUpdateBusinessMetadataAsync with required parameters and request content.
+      <example>
+This sample shows how to call AddOrUpdateBusinessMetadataAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {
-    key = new {},
-};
-
-Response response = await client.AddOrUpdateBusinessMetadataAsync("<guid>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.AddOrUpdateBusinessMetadataAsync("<guid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call AddOrUpdateBusinessMetadataAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {
-    key = new {},
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.AddOrUpdateBusinessMetadataAsync("<guid>", RequestContent.Create(data), true);
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = new Dictionary<string, object>(),
+});
+Response response = await client.AddOrUpdateBusinessMetadataAsync("<guid>", content, isOverwrite: true);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="AddOrUpdateBusinessMetadata(string,RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call AddOrUpdateBusinessMetadata with required parameters and request content.
+      <example>
+This sample shows how to call AddOrUpdateBusinessMetadata.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {
-    key = new {},
-};
-
-Response response = client.AddOrUpdateBusinessMetadata("<guid>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.AddOrUpdateBusinessMetadata("<guid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call AddOrUpdateBusinessMetadata with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {
-    key = new {},
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.AddOrUpdateBusinessMetadata("<guid>", RequestContent.Create(data), true);
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = new Dictionary<string, object>(),
+});
+Response response = client.AddOrUpdateBusinessMetadata("<guid>", content, isOverwrite: true);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteBusinessMetadataAttributesAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DeleteBusinessMetadataAttributesAsync with required parameters and request content.
+      <example>
+This sample shows how to call DeleteBusinessMetadataAttributesAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {
-    key = new {},
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.DeleteBusinessMetadataAttributesAsync("<guid>", "<bmName>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.DeleteBusinessMetadataAttributesAsync("<guid>", "<bmName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteBusinessMetadataAttributesAsync with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = new Dictionary<string, object>(),
+});
+Response response = await client.DeleteBusinessMetadataAttributesAsync("<guid>", "<bmName>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteBusinessMetadataAttributes(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DeleteBusinessMetadataAttributes with required parameters and request content.
+      <example>
+This sample shows how to call DeleteBusinessMetadataAttributes.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new {
-    key = new {},
-};
-
-Response response = client.DeleteBusinessMetadataAttributes("<guid>", "<bmName>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.DeleteBusinessMetadataAttributes("<guid>", "<bmName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteBusinessMetadataAttributes with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = new Dictionary<string, object>(),
+});
+Response response = client.DeleteBusinessMetadataAttributes("<guid>", "<bmName>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="AddOrUpdateBusinessMetadataAttributesAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call AddOrUpdateBusinessMetadataAttributesAsync with required parameters and request content.
+      <example>
+This sample shows how to call AddOrUpdateBusinessMetadataAttributesAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {
-    key = new {},
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.AddOrUpdateBusinessMetadataAttributesAsync("<guid>", "<bmName>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.AddOrUpdateBusinessMetadataAttributesAsync("<guid>", "<bmName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call AddOrUpdateBusinessMetadataAttributesAsync with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = new Dictionary<string, object>(),
+});
+Response response = await client.AddOrUpdateBusinessMetadataAttributesAsync("<guid>", "<bmName>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="AddOrUpdateBusinessMetadataAttributes(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call AddOrUpdateBusinessMetadataAttributes with required parameters and request content.
+      <example>
+This sample shows how to call AddOrUpdateBusinessMetadataAttributes.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new {
-    key = new {},
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.AddOrUpdateBusinessMetadataAttributes("<guid>", "<bmName>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.AddOrUpdateBusinessMetadataAttributes("<guid>", "<bmName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call AddOrUpdateBusinessMetadataAttributes with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = new Dictionary<string, object>(),
+});
+Response response = client.AddOrUpdateBusinessMetadataAttributes("<guid>", "<bmName>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetSampleBusinessMetadataTemplateAsync(RequestContext)">
-<example>
-This sample shows how to call GetSampleBusinessMetadataTemplateAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSampleBusinessMetadataTemplateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.GetSampleBusinessMetadataTemplateAsync(new RequestContext());
+Response response = await client.GetSampleBusinessMetadataTemplateAsync(null);
 if (response.ContentStream != null)
 {
-    using(Stream outFileStream = File.OpenWrite("<filePath>"))
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
     {
         response.ContentStream.CopyTo(outFileStream);
     }
 }
 ]]></code>
-</example>
+This sample shows how to call GetSampleBusinessMetadataTemplateAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = await client.GetSampleBusinessMetadataTemplateAsync(null);
+if (response.ContentStream != null)
+{
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
+    {
+        response.ContentStream.CopyTo(outFileStream);
+    }
+}
+]]></code></example>
     </member>
     <member name="GetSampleBusinessMetadataTemplate(RequestContext)">
-<example>
-This sample shows how to call GetSampleBusinessMetadataTemplate with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSampleBusinessMetadataTemplate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.GetSampleBusinessMetadataTemplate(new RequestContext());
+Response response = client.GetSampleBusinessMetadataTemplate(null);
 if (response.ContentStream != null)
 {
-    using(Stream outFileStream = File.OpenWrite("<filePath>"))
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
     {
         response.ContentStream.CopyTo(outFileStream);
     }
 }
 ]]></code>
-</example>
+This sample shows how to call GetSampleBusinessMetadataTemplate with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+Response response = client.GetSampleBusinessMetadataTemplate(null);
+if (response.ContentStream != null)
+{
+    using (Stream outFileStream = File.OpenWrite("<filepath>"))
+    {
+        response.ContentStream.CopyTo(outFileStream);
+    }
+}
+]]></code></example>
     </member>
     <member name="ImportBusinessMetadataAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call ImportBusinessMetadataAsync with required request content and parse the result.
+      <example>
+This sample shows how to call ImportBusinessMetadataAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = File.OpenRead("<filePath>");
+RequestContent content = null;
+Response response = await client.ImportBusinessMetadataAsync(content);
 
-Response response = await client.ImportBusinessMetadataAsync(RequestContent.Create(data));
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call ImportBusinessMetadataAsync with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = await client.ImportBusinessMetadataAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("failedImportInfoList")[0].GetProperty("childObjectName").ToString());
@@ -4044,20 +4151,30 @@ Console.WriteLine(result.GetProperty("successImportInfoList")[0].GetProperty("ch
 Console.WriteLine(result.GetProperty("successImportInfoList")[0].GetProperty("importStatus").ToString());
 Console.WriteLine(result.GetProperty("successImportInfoList")[0].GetProperty("parentObjectName").ToString());
 Console.WriteLine(result.GetProperty("successImportInfoList")[0].GetProperty("remarks").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="ImportBusinessMetadata(RequestContent,RequestContext)">
-<example>
-This sample shows how to call ImportBusinessMetadata with required request content and parse the result.
+      <example>
+This sample shows how to call ImportBusinessMetadata and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = null;
+Response response = client.ImportBusinessMetadata(content);
 
-var data = File.OpenRead("<filePath>");
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call ImportBusinessMetadata with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.ImportBusinessMetadata(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = client.ImportBusinessMetadata(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("failedImportInfoList")[0].GetProperty("childObjectName").ToString());
@@ -4068,290 +4185,319 @@ Console.WriteLine(result.GetProperty("successImportInfoList")[0].GetProperty("ch
 Console.WriteLine(result.GetProperty("successImportInfoList")[0].GetProperty("importStatus").ToString());
 Console.WriteLine(result.GetProperty("successImportInfoList")[0].GetProperty("parentObjectName").ToString());
 Console.WriteLine(result.GetProperty("successImportInfoList")[0].GetProperty("remarks").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteLabelsAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DeleteLabelsAsync with required parameters and request content.
+      <example>
+This sample shows how to call DeleteLabelsAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    "<String>"
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.DeleteLabelsAsync("<guid>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.DeleteLabelsAsync("<guid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteLabelsAsync with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+Response response = await client.DeleteLabelsAsync("<guid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteLabels(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DeleteLabels with required parameters and request content.
+      <example>
+This sample shows how to call DeleteLabels.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new[] {
-    "<String>"
-};
-
-Response response = client.DeleteLabels("<guid>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.DeleteLabels("<guid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteLabels with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+Response response = client.DeleteLabels("<guid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="SetLabelsAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call SetLabelsAsync with required parameters and request content.
+      <example>
+This sample shows how to call SetLabelsAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new[] {
-    "<String>"
-};
-
-Response response = await client.SetLabelsAsync("<guid>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.SetLabelsAsync("<guid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call SetLabelsAsync with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+Response response = await client.SetLabelsAsync("<guid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="SetLabels(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call SetLabels with required parameters and request content.
+      <example>
+This sample shows how to call SetLabels.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    "<String>"
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.SetLabels("<guid>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.SetLabels("<guid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call SetLabels with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+Response response = client.SetLabels("<guid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="AddLabelAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call AddLabelAsync with required parameters and request content.
+      <example>
+This sample shows how to call AddLabelAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new[] {
-    "<String>"
-};
-
-Response response = await client.AddLabelAsync("<guid>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.AddLabelAsync("<guid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call AddLabelAsync with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+Response response = await client.AddLabelAsync("<guid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="AddLabel(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call AddLabel with required parameters and request content.
+      <example>
+This sample shows how to call AddLabel.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new[] {
-    "<String>"
-};
-
-Response response = client.AddLabel("<guid>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.AddLabel("<guid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call AddLabel with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+Response response = client.AddLabel("<guid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteLabelsByUniqueAttributeAsync(string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call DeleteLabelsByUniqueAttributeAsync with required parameters and request content.
+      <example>
+This sample shows how to call DeleteLabelsByUniqueAttributeAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    "<String>"
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.DeleteLabelsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.DeleteLabelsByUniqueAttributeAsync("<typeName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call DeleteLabelsByUniqueAttributeAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new[] {
-    "<String>"
-};
-
-Response response = await client.DeleteLabelsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+Response response = await client.DeleteLabelsByUniqueAttributeAsync("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteLabelsByUniqueAttribute(string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call DeleteLabelsByUniqueAttribute with required parameters and request content.
+      <example>
+This sample shows how to call DeleteLabelsByUniqueAttribute.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    "<String>"
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.DeleteLabelsByUniqueAttribute("<typeName>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.DeleteLabelsByUniqueAttribute("<typeName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call DeleteLabelsByUniqueAttribute with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new[] {
-    "<String>"
-};
-
-Response response = client.DeleteLabelsByUniqueAttribute("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+Response response = client.DeleteLabelsByUniqueAttribute("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="SetLabelsByUniqueAttributeAsync(string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call SetLabelsByUniqueAttributeAsync with required parameters and request content.
+      <example>
+This sample shows how to call SetLabelsByUniqueAttributeAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    "<String>"
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.SetLabelsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.SetLabelsByUniqueAttributeAsync("<typeName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call SetLabelsByUniqueAttributeAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    "<String>"
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.SetLabelsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+Response response = await client.SetLabelsByUniqueAttributeAsync("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="SetLabelsByUniqueAttribute(string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call SetLabelsByUniqueAttribute with required parameters and request content.
+      <example>
+This sample shows how to call SetLabelsByUniqueAttribute.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new[] {
-    "<String>"
-};
-
-Response response = client.SetLabelsByUniqueAttribute("<typeName>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.SetLabelsByUniqueAttribute("<typeName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call SetLabelsByUniqueAttribute with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    "<String>"
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.SetLabelsByUniqueAttribute("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+Response response = client.SetLabelsByUniqueAttribute("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="AddLabelsByUniqueAttributeAsync(string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call AddLabelsByUniqueAttributeAsync with required parameters and request content.
+      <example>
+This sample shows how to call AddLabelsByUniqueAttributeAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    "<String>"
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = await client.AddLabelsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.AddLabelsByUniqueAttributeAsync("<typeName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call AddLabelsByUniqueAttributeAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new[] {
-    "<String>"
-};
-
-Response response = await client.AddLabelsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+Response response = await client.AddLabelsByUniqueAttributeAsync("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="AddLabelsByUniqueAttribute(string,RequestContent,string,RequestContext)">
-<example>
-This sample shows how to call AddLabelsByUniqueAttribute with required parameters and request content.
+      <example>
+This sample shows how to call AddLabelsByUniqueAttribute.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-var data = new[] {
-    "<String>"
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-Response response = client.AddLabelsByUniqueAttribute("<typeName>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.AddLabelsByUniqueAttribute("<typeName>", content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call AddLabelsByUniqueAttribute with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-var data = new[] {
-    "<String>"
-};
-
-Response response = client.AddLabelsByUniqueAttribute("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+Response response = client.AddLabelsByUniqueAttribute("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewGlossaries.xml b/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewGlossaries.xml
index f76f485a0206..e47055126acb 100644
--- a/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewGlossaries.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewGlossaries.xml
@@ -2,14 +2,25 @@
 <doc>
   <members>
     <member name="GetGlossariesAsync(int?,int?,string,bool?,RequestContext)">
-<example>
-This sample shows how to call GetGlossariesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossariesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetGlossariesAsync(1234, 1234, "<sort>", true, new RequestContext());
+Response response = await client.GetGlossariesAsync(null, null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetGlossariesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetGlossariesAsync(1234, 1234, "<sort>", true, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -34,8 +45,8 @@ Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("valid
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -44,18 +55,28 @@ Console.WriteLine(result[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result[0].GetProperty("shortDescription").ToString());
 Console.WriteLine(result[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGlossaries(int?,int?,string,bool?,RequestContext)">
-<example>
-This sample shows how to call GetGlossaries with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossaries and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetGlossaries(null, null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetGlossaries with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetGlossaries(1234, 1234, "<sort>", true, new RequestContext());
+Response response = client.GetGlossaries(1234, 1234, "<sort>", true, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -80,8 +101,8 @@ Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("valid
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -90,422 +111,94 @@ Console.WriteLine(result[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result[0].GetProperty("shortDescription").ToString());
 Console.WriteLine(result[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateGlossaryAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateGlossaryAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new {};
-
-Response response = await client.CreateGlossaryAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateGlossaryAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateGlossaryAsync with all request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    categoryInfo = new {
-        key = new {
-            anchor = new {
-                displayText = "<displayText>",
-                glossaryGuid = "<glossaryGuid>",
-                relationGuid = "<relationGuid>",
-            },
-            childrenCategories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    parentCategoryGuid = "<parentCategoryGuid>",
-                    relationGuid = "<relationGuid>",
-                }
-            },
-            parentCategory = new {
-                categoryGuid = "<categoryGuid>",
-                description = "<description>",
-                displayText = "<displayText>",
-                parentCategoryGuid = "<parentCategoryGuid>",
-                relationGuid = "<relationGuid>",
-            },
-            terms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            longDescription = "<longDescription>",
-            name = "<name>",
-            qualifiedName = "<qualifiedName>",
-            shortDescription = "<shortDescription>",
-            lastModifiedTS = "<lastModifiedTS>",
-            guid = "<guid>",
-        },
-    },
-    termInfo = new {
-        key = new {
-            abbreviation = "<abbreviation>",
-            templateName = new[] {
-                new {}
-            },
-            anchor = new {
-                displayText = "<displayText>",
-                glossaryGuid = "<glossaryGuid>",
-                relationGuid = "<relationGuid>",
-            },
-            antonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            status = "Draft",
-            resources = new[] {
-                new {
-                    displayName = "<displayName>",
-                    url = "<url>",
-                }
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {
-                    key = new {},
-                },
-            },
-            assignedEntities = new[] {
-                new {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                            new {
-                                endTime = "<endTime>",
-                                startTime = "<startTime>",
-                                timeZone = "<timeZone>",
-                            }
-                        },
-                        source = "<source>",
-                        sourceDetails = new {
-                            key = new {},
-                        },
-                        attributes = new {
-                            key = new {},
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new {
-                        key = new {},
-                    },
-                }
-            },
-            categories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    relationGuid = "<relationGuid>",
-                    status = "DRAFT",
-                }
-            },
-            classifies = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            examples = new[] {
-                "<String>"
-            },
-            isA = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            preferredTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            preferredToTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            replacedBy = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            replacementTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            seeAlso = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            synonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            translatedTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            translationTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            usage = "<usage>",
-            validValues = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            validValuesFor = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            longDescription = "<longDescription>",
-            name = "<name>",
-            qualifiedName = "<qualifiedName>",
-            shortDescription = "<shortDescription>",
-            lastModifiedTS = "<lastModifiedTS>",
-            guid = "<guid>",
-        },
-    },
-    categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-    language = "<language>",
-    terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    usage = "<usage>",
-    classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    longDescription = "<longDescription>",
-    name = "<name>",
-    qualifiedName = "<qualifiedName>",
-    shortDescription = "<shortDescription>",
-    lastModifiedTS = "<lastModifiedTS>",
-    guid = "<guid>",
-};
-
-Response response = await client.CreateGlossaryAsync(RequestContent.Create(data));
+This sample shows how to call CreateGlossaryAsync with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+    ["language"] = "<language>",
+    ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+    ["usage"] = "<usage>",
+    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["longDescription"] = "<longDescription>",
+    ["name"] = "<name>",
+    ["qualifiedName"] = "<qualifiedName>",
+    ["shortDescription"] = "<shortDescription>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+    ["guid"] = "<guid>",
+});
+Response response = await client.CreateGlossaryAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -530,8 +223,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -540,422 +233,94 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateGlossary(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateGlossary and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.CreateGlossary(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateGlossary(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateGlossary with all request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    categoryInfo = new {
-        key = new {
-            anchor = new {
-                displayText = "<displayText>",
-                glossaryGuid = "<glossaryGuid>",
-                relationGuid = "<relationGuid>",
-            },
-            childrenCategories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    parentCategoryGuid = "<parentCategoryGuid>",
-                    relationGuid = "<relationGuid>",
-                }
-            },
-            parentCategory = new {
-                categoryGuid = "<categoryGuid>",
-                description = "<description>",
-                displayText = "<displayText>",
-                parentCategoryGuid = "<parentCategoryGuid>",
-                relationGuid = "<relationGuid>",
-            },
-            terms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            longDescription = "<longDescription>",
-            name = "<name>",
-            qualifiedName = "<qualifiedName>",
-            shortDescription = "<shortDescription>",
-            lastModifiedTS = "<lastModifiedTS>",
-            guid = "<guid>",
-        },
-    },
-    termInfo = new {
-        key = new {
-            abbreviation = "<abbreviation>",
-            templateName = new[] {
-                new {}
-            },
-            anchor = new {
-                displayText = "<displayText>",
-                glossaryGuid = "<glossaryGuid>",
-                relationGuid = "<relationGuid>",
-            },
-            antonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            status = "Draft",
-            resources = new[] {
-                new {
-                    displayName = "<displayName>",
-                    url = "<url>",
-                }
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {
-                    key = new {},
-                },
-            },
-            assignedEntities = new[] {
-                new {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                            new {
-                                endTime = "<endTime>",
-                                startTime = "<startTime>",
-                                timeZone = "<timeZone>",
-                            }
-                        },
-                        source = "<source>",
-                        sourceDetails = new {
-                            key = new {},
-                        },
-                        attributes = new {
-                            key = new {},
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new {
-                        key = new {},
-                    },
-                }
-            },
-            categories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    relationGuid = "<relationGuid>",
-                    status = "DRAFT",
-                }
-            },
-            classifies = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            examples = new[] {
-                "<String>"
-            },
-            isA = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            preferredTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            preferredToTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            replacedBy = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            replacementTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            seeAlso = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            synonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            translatedTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            translationTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            usage = "<usage>",
-            validValues = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            validValuesFor = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            longDescription = "<longDescription>",
-            name = "<name>",
-            qualifiedName = "<qualifiedName>",
-            shortDescription = "<shortDescription>",
-            lastModifiedTS = "<lastModifiedTS>",
-            guid = "<guid>",
-        },
-    },
-    categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-    language = "<language>",
-    terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    usage = "<usage>",
-    classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    longDescription = "<longDescription>",
-    name = "<name>",
-    qualifiedName = "<qualifiedName>",
-    shortDescription = "<shortDescription>",
-    lastModifiedTS = "<lastModifiedTS>",
-    guid = "<guid>",
-};
-
-Response response = client.CreateGlossary(RequestContent.Create(data));
+This sample shows how to call CreateGlossary with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+    ["language"] = "<language>",
+    ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+    ["usage"] = "<usage>",
+    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["longDescription"] = "<longDescription>",
+    ["name"] = "<name>",
+    ["qualifiedName"] = "<qualifiedName>",
+    ["shortDescription"] = "<shortDescription>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+    ["guid"] = "<guid>",
+});
+Response response = client.CreateGlossary(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -980,8 +345,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -990,85 +355,106 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateGlossaryCategoriesAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateGlossaryCategoriesAsync with required request content and parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new[] {
-    new {
-        anchor = new {
-            displayText = "<displayText>",
-            glossaryGuid = "<glossaryGuid>",
-            relationGuid = "<relationGuid>",
-        },
-        childrenCategories = new[] {
-            new {
-                categoryGuid = "<categoryGuid>",
-                description = "<description>",
-                displayText = "<displayText>",
-                parentCategoryGuid = "<parentCategoryGuid>",
-                relationGuid = "<relationGuid>",
-            }
-        },
-        parentCategory = new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        },
-        terms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-        longDescription = "<longDescription>",
-        name = "<name>",
-        qualifiedName = "<qualifiedName>",
-        shortDescription = "<shortDescription>",
-        lastModifiedTS = "<lastModifiedTS>",
-        guid = "<guid>",
-    }
-};
+      <example>
+This sample shows how to call CreateGlossaryCategoriesAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.CreateGlossaryCategoriesAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = await client.CreateGlossaryCategoriesAsync(content);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call CreateGlossaryCategoriesAsync with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["anchor"] = new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["glossaryGuid"] = "<glossaryGuid>",
+["relationGuid"] = "<relationGuid>",
+},
+["childrenCategories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+["parentCategory"] = null
+,
+["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["longDescription"] = "<longDescription>",
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+["shortDescription"] = "<shortDescription>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+["guid"] = "<guid>",
+}
+});
+Response response = await client.CreateGlossaryCategoriesAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1099,8 +485,8 @@ Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("valid
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -1109,85 +495,106 @@ Console.WriteLine(result[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result[0].GetProperty("shortDescription").ToString());
 Console.WriteLine(result[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateGlossaryCategories(RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateGlossaryCategories with required request content and parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new[] {
-    new {
-        anchor = new {
-            displayText = "<displayText>",
-            glossaryGuid = "<glossaryGuid>",
-            relationGuid = "<relationGuid>",
-        },
-        childrenCategories = new[] {
-            new {
-                categoryGuid = "<categoryGuid>",
-                description = "<description>",
-                displayText = "<displayText>",
-                parentCategoryGuid = "<parentCategoryGuid>",
-                relationGuid = "<relationGuid>",
-            }
-        },
-        parentCategory = new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        },
-        terms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-        longDescription = "<longDescription>",
-        name = "<name>",
-        qualifiedName = "<qualifiedName>",
-        shortDescription = "<shortDescription>",
-        lastModifiedTS = "<lastModifiedTS>",
-        guid = "<guid>",
-    }
-};
+      <example>
+This sample shows how to call CreateGlossaryCategories and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.CreateGlossaryCategories(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = client.CreateGlossaryCategories(content);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call CreateGlossaryCategories with all request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["anchor"] = new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["glossaryGuid"] = "<glossaryGuid>",
+["relationGuid"] = "<relationGuid>",
+},
+["childrenCategories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+["parentCategory"] = null
+,
+["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["longDescription"] = "<longDescription>",
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+["shortDescription"] = "<shortDescription>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+["guid"] = "<guid>",
+}
+});
+Response response = client.CreateGlossaryCategories(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1218,8 +625,8 @@ Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("valid
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -1228,96 +635,100 @@ Console.WriteLine(result[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result[0].GetProperty("shortDescription").ToString());
 Console.WriteLine(result[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateGlossaryCategoryAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateGlossaryCategoryAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new {};
-
-Response response = await client.CreateGlossaryCategoryAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateGlossaryCategoryAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateGlossaryCategoryAsync with all request content, and how to parse the result.
+This sample shows how to call CreateGlossaryCategoryAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    anchor = new {
-        displayText = "<displayText>",
-        glossaryGuid = "<glossaryGuid>",
-        relationGuid = "<relationGuid>",
-    },
-    childrenCategories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-    parentCategory = new {
-        categoryGuid = "<categoryGuid>",
-        description = "<description>",
-        displayText = "<displayText>",
-        parentCategoryGuid = "<parentCategoryGuid>",
-        relationGuid = "<relationGuid>",
-    },
-    terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    longDescription = "<longDescription>",
-    name = "<name>",
-    qualifiedName = "<qualifiedName>",
-    shortDescription = "<shortDescription>",
-    lastModifiedTS = "<lastModifiedTS>",
-    guid = "<guid>",
-};
-
-Response response = await client.CreateGlossaryCategoryAsync(RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["anchor"] = new Dictionary<string, object>()
+    {
+        ["displayText"] = "<displayText>",
+        ["glossaryGuid"] = "<glossaryGuid>",
+        ["relationGuid"] = "<relationGuid>",
+    },
+    ["childrenCategories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+    ["parentCategory"] = null
+,
+    ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["longDescription"] = "<longDescription>",
+    ["name"] = "<name>",
+    ["qualifiedName"] = "<qualifiedName>",
+    ["shortDescription"] = "<shortDescription>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+    ["guid"] = "<guid>",
+});
+Response response = await client.CreateGlossaryCategoryAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1348,8 +759,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -1358,96 +769,100 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateGlossaryCategory(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateGlossaryCategory and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.CreateGlossaryCategory(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateGlossaryCategory(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateGlossaryCategory with all request content, and how to parse the result.
+This sample shows how to call CreateGlossaryCategory with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    anchor = new {
-        displayText = "<displayText>",
-        glossaryGuid = "<glossaryGuid>",
-        relationGuid = "<relationGuid>",
-    },
-    childrenCategories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-    parentCategory = new {
-        categoryGuid = "<categoryGuid>",
-        description = "<description>",
-        displayText = "<displayText>",
-        parentCategoryGuid = "<parentCategoryGuid>",
-        relationGuid = "<relationGuid>",
-    },
-    terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    longDescription = "<longDescription>",
-    name = "<name>",
-    qualifiedName = "<qualifiedName>",
-    shortDescription = "<shortDescription>",
-    lastModifiedTS = "<lastModifiedTS>",
-    guid = "<guid>",
-};
-
-Response response = client.CreateGlossaryCategory(RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["anchor"] = new Dictionary<string, object>()
+    {
+        ["displayText"] = "<displayText>",
+        ["glossaryGuid"] = "<glossaryGuid>",
+        ["relationGuid"] = "<relationGuid>",
+    },
+    ["childrenCategories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+    ["parentCategory"] = null
+,
+    ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["longDescription"] = "<longDescription>",
+    ["name"] = "<name>",
+    ["qualifiedName"] = "<qualifiedName>",
+    ["shortDescription"] = "<shortDescription>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+    ["guid"] = "<guid>",
+});
+Response response = client.CreateGlossaryCategory(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1478,8 +893,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -1488,18 +903,28 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGlossaryCategoryAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetGlossaryCategoryAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossaryCategoryAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetGlossaryCategoryAsync("<categoryGuid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetGlossaryCategoryAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetGlossaryCategoryAsync("<categoryGuid>", new RequestContext());
+Response response = await client.GetGlossaryCategoryAsync("<categoryGuid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1530,8 +955,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -1540,18 +965,28 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGlossaryCategory(string,RequestContext)">
-<example>
-This sample shows how to call GetGlossaryCategory with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossaryCategory and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetGlossaryCategory("<categoryGuid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetGlossaryCategory with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetGlossaryCategory("<categoryGuid>", new RequestContext());
+Response response = client.GetGlossaryCategory("<categoryGuid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1582,8 +1017,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -1592,96 +1027,100 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateGlossaryCategoryAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateGlossaryCategoryAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call UpdateGlossaryCategoryAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new {};
-
-Response response = await client.UpdateGlossaryCategoryAsync("<categoryGuid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.UpdateGlossaryCategoryAsync("<categoryGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateGlossaryCategoryAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call UpdateGlossaryCategoryAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    anchor = new {
-        displayText = "<displayText>",
-        glossaryGuid = "<glossaryGuid>",
-        relationGuid = "<relationGuid>",
-    },
-    childrenCategories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-    parentCategory = new {
-        categoryGuid = "<categoryGuid>",
-        description = "<description>",
-        displayText = "<displayText>",
-        parentCategoryGuid = "<parentCategoryGuid>",
-        relationGuid = "<relationGuid>",
-    },
-    terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    longDescription = "<longDescription>",
-    name = "<name>",
-    qualifiedName = "<qualifiedName>",
-    shortDescription = "<shortDescription>",
-    lastModifiedTS = "<lastModifiedTS>",
-    guid = "<guid>",
-};
-
-Response response = await client.UpdateGlossaryCategoryAsync("<categoryGuid>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["anchor"] = new Dictionary<string, object>()
+    {
+        ["displayText"] = "<displayText>",
+        ["glossaryGuid"] = "<glossaryGuid>",
+        ["relationGuid"] = "<relationGuid>",
+    },
+    ["childrenCategories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+    ["parentCategory"] = null
+,
+    ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["longDescription"] = "<longDescription>",
+    ["name"] = "<name>",
+    ["qualifiedName"] = "<qualifiedName>",
+    ["shortDescription"] = "<shortDescription>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+    ["guid"] = "<guid>",
+});
+Response response = await client.UpdateGlossaryCategoryAsync("<categoryGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1712,8 +1151,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -1722,96 +1161,100 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateGlossaryCategory(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateGlossaryCategory with required parameters and parse the result.
+      <example>
+This sample shows how to call UpdateGlossaryCategory and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.UpdateGlossaryCategory("<categoryGuid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.UpdateGlossaryCategory("<categoryGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateGlossaryCategory with all parameters and request content, and how to parse the result.
+This sample shows how to call UpdateGlossaryCategory with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    anchor = new {
-        displayText = "<displayText>",
-        glossaryGuid = "<glossaryGuid>",
-        relationGuid = "<relationGuid>",
-    },
-    childrenCategories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-    parentCategory = new {
-        categoryGuid = "<categoryGuid>",
-        description = "<description>",
-        displayText = "<displayText>",
-        parentCategoryGuid = "<parentCategoryGuid>",
-        relationGuid = "<relationGuid>",
-    },
-    terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    longDescription = "<longDescription>",
-    name = "<name>",
-    qualifiedName = "<qualifiedName>",
-    shortDescription = "<shortDescription>",
-    lastModifiedTS = "<lastModifiedTS>",
-    guid = "<guid>",
-};
-
-Response response = client.UpdateGlossaryCategory("<categoryGuid>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["anchor"] = new Dictionary<string, object>()
+    {
+        ["displayText"] = "<displayText>",
+        ["glossaryGuid"] = "<glossaryGuid>",
+        ["relationGuid"] = "<relationGuid>",
+    },
+    ["childrenCategories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+    ["parentCategory"] = null
+,
+    ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["longDescription"] = "<longDescription>",
+    ["name"] = "<name>",
+    ["qualifiedName"] = "<qualifiedName>",
+    ["shortDescription"] = "<shortDescription>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+    ["guid"] = "<guid>",
+});
+Response response = client.UpdateGlossaryCategory("<categoryGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1842,8 +1285,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -1852,48 +1295,78 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteGlossaryCategoryAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteGlossaryCategoryAsync with required parameters.
+      <example>
+This sample shows how to call DeleteGlossaryCategoryAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
 Response response = await client.DeleteGlossaryCategoryAsync("<categoryGuid>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteGlossaryCategoryAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.DeleteGlossaryCategoryAsync("<categoryGuid>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteGlossaryCategory(string,RequestContext)">
-<example>
-This sample shows how to call DeleteGlossaryCategory with required parameters.
+      <example>
+This sample shows how to call DeleteGlossaryCategory.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
 Response response = client.DeleteGlossaryCategory("<categoryGuid>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteGlossaryCategory with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.DeleteGlossaryCategory("<categoryGuid>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="PartialUpdateGlossaryCategoryAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call PartialUpdateGlossaryCategoryAsync with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call PartialUpdateGlossaryCategoryAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new {
-    key = "<String>",
-};
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = "<partialUpdates>",
+});
+Response response = await client.PartialUpdateGlossaryCategoryAsync("<categoryGuid>", content);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call PartialUpdateGlossaryCategoryAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.PartialUpdateGlossaryCategoryAsync("<categoryGuid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = "<partialUpdates>",
+});
+Response response = await client.PartialUpdateGlossaryCategoryAsync("<categoryGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1924,8 +1397,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -1934,22 +1407,36 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="PartialUpdateGlossaryCategory(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call PartialUpdateGlossaryCategory with required parameters and request content and parse the result.
+      <example>
+This sample shows how to call PartialUpdateGlossaryCategory and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new {
-    key = "<String>",
-};
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = "<partialUpdates>",
+});
+Response response = client.PartialUpdateGlossaryCategory("<categoryGuid>", content);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call PartialUpdateGlossaryCategory with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.PartialUpdateGlossaryCategory("<categoryGuid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = "<partialUpdates>",
+});
+Response response = client.PartialUpdateGlossaryCategory("<categoryGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1980,8 +1467,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -1990,56 +1477,86 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRelatedCategoriesAsync(string,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetRelatedCategoriesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRelatedCategoriesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetRelatedCategoriesAsync("<categoryGuid>", 1234, 1234, "<sort>", new RequestContext());
+Response response = await client.GetRelatedCategoriesAsync("<categoryGuid>", null, null, null, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("categoryGuid").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("parentCategoryGuid").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].ToString());
 ]]></code>
-</example>
+This sample shows how to call GetRelatedCategoriesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetRelatedCategoriesAsync("<categoryGuid>", 1234, 1234, "<sort>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("categoryGuid").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("parentCategoryGuid").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("relationGuid").ToString());
+]]></code></example>
     </member>
     <member name="GetRelatedCategories(string,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetRelatedCategories with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRelatedCategories and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetRelatedCategories("<categoryGuid>", 1234, 1234, "<sort>", new RequestContext());
+Response response = client.GetRelatedCategories("<categoryGuid>", null, null, null, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("categoryGuid").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("parentCategoryGuid").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].ToString());
 ]]></code>
-</example>
+This sample shows how to call GetRelatedCategories with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetRelatedCategories("<categoryGuid>", 1234, 1234, "<sort>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("categoryGuid").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("parentCategoryGuid").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("relationGuid").ToString());
+]]></code></example>
     </member>
     <member name="GetCategoryTermsAsync(string,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetCategoryTermsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCategoryTermsAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetCategoryTermsAsync("<categoryGuid>", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetCategoryTermsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetCategoryTermsAsync("<categoryGuid>", 1234, 1234, "<sort>", new RequestContext());
+Response response = await client.GetCategoryTermsAsync("<categoryGuid>", 1234, 1234, "<sort>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("description").ToString());
@@ -2050,18 +1567,28 @@ Console.WriteLine(result[0].GetProperty("source").ToString());
 Console.WriteLine(result[0].GetProperty("status").ToString());
 Console.WriteLine(result[0].GetProperty("steward").ToString());
 Console.WriteLine(result[0].GetProperty("termGuid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetCategoryTerms(string,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetCategoryTerms with required parameters and parse the result.
+      <example>
+This sample shows how to call GetCategoryTerms and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetCategoryTerms("<categoryGuid>", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetCategoryTerms with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetCategoryTerms("<categoryGuid>", 1234, 1234, "<sort>", new RequestContext());
+Response response = client.GetCategoryTerms("<categoryGuid>", 1234, 1234, "<sort>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("description").ToString());
@@ -2072,300 +1599,213 @@ Console.WriteLine(result[0].GetProperty("source").ToString());
 Console.WriteLine(result[0].GetProperty("status").ToString());
 Console.WriteLine(result[0].GetProperty("steward").ToString());
 Console.WriteLine(result[0].GetProperty("termGuid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateGlossaryTermAsync(RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call CreateGlossaryTermAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateGlossaryTermAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new {};
-
-Response response = await client.CreateGlossaryTermAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateGlossaryTermAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateGlossaryTermAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateGlossaryTermAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    abbreviation = "<abbreviation>",
-    templateName = new[] {
-        new {}
-    },
-    anchor = new {
-        displayText = "<displayText>",
-        glossaryGuid = "<glossaryGuid>",
-        relationGuid = "<relationGuid>",
-    },
-    antonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    createTime = 123.45f,
-    createdBy = "<createdBy>",
-    updateTime = 123.45f,
-    updatedBy = "<updatedBy>",
-    status = "Draft",
-    resources = new[] {
-        new {
-            displayName = "<displayName>",
-            url = "<url>",
-        }
-    },
-    contacts = new {
-        key = new[] {
-            new {
-                id = "<id>",
-                info = "<info>",
-            }
-        },
-    },
-    attributes = new {
-        key = new {
-            key = new {},
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["abbreviation"] = "<abbreviation>",
+    ["templateName"] = new List<object>()
+{
+new Dictionary<string, object>()
+},
+    ["anchor"] = new Dictionary<string, object>()
+    {
+        ["displayText"] = "<displayText>",
+        ["glossaryGuid"] = "<glossaryGuid>",
+        ["relationGuid"] = "<relationGuid>",
+    },
+    ["antonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+    ["createTime"] = 123.45F,
+    ["createdBy"] = "<createdBy>",
+    ["updateTime"] = 123.45F,
+    ["updatedBy"] = "<updatedBy>",
+    ["status"] = "Draft",
+    ["resources"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["url"] = "<url>",
+}
+},
+    ["contacts"] = new Dictionary<string, object>()
+    {
+        ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+    },
+    ["attributes"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
     },
-    assignedEntities = new[] {
-        new {
-            displayText = "<displayText>",
-            entityStatus = "ACTIVE",
-            relationshipType = "<relationshipType>",
-            relationshipAttributes = new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            },
-            relationshipGuid = "<relationshipGuid>",
-            relationshipStatus = "ACTIVE",
-            guid = "<guid>",
-            typeName = "<typeName>",
-            uniqueAttributes = new {
-                key = new {},
-            },
-        }
-    },
-    categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            relationGuid = "<relationGuid>",
-            status = "DRAFT",
-        }
-    },
-    classifies = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    examples = new[] {
-        "<String>"
-    },
-    isA = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    preferredTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    preferredToTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    replacedBy = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    replacementTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    seeAlso = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    synonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    translatedTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    translationTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    usage = "<usage>",
-    validValues = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    validValuesFor = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    longDescription = "<longDescription>",
-    name = "<name>",
-    qualifiedName = "<qualifiedName>",
-    shortDescription = "<shortDescription>",
-    lastModifiedTS = "<lastModifiedTS>",
-    guid = "<guid>",
-};
-
-Response response = await client.CreateGlossaryTermAsync(RequestContent.Create(data), true);
+    ["assignedEntities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+},
+    ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["relationGuid"] = "<relationGuid>",
+["status"] = "DRAFT",
+}
+},
+    ["classifies"] = new List<object>()
+{
+null
+},
+    ["examples"] = new List<object>()
+{
+"<examples>"
+},
+    ["isA"] = new List<object>()
+{
+null
+},
+    ["preferredTerms"] = new List<object>()
+{
+null
+},
+    ["preferredToTerms"] = new List<object>()
+{
+null
+},
+    ["replacedBy"] = new List<object>()
+{
+null
+},
+    ["replacementTerms"] = new List<object>()
+{
+null
+},
+    ["seeAlso"] = new List<object>()
+{
+null
+},
+    ["synonyms"] = new List<object>()
+{
+null
+},
+    ["translatedTerms"] = new List<object>()
+{
+null
+},
+    ["translationTerms"] = new List<object>()
+{
+null
+},
+    ["usage"] = "<usage>",
+    ["validValues"] = new List<object>()
+{
+null
+},
+    ["validValuesFor"] = new List<object>()
+{
+null
+},
+    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["longDescription"] = "<longDescription>",
+    ["name"] = "<name>",
+    ["qualifiedName"] = "<qualifiedName>",
+    ["shortDescription"] = "<shortDescription>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+    ["guid"] = "<guid>",
+});
+Response response = await client.CreateGlossaryTermAsync(content, includeTermHierarchy: true);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -2388,20 +1828,20 @@ Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -2512,8 +1952,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -2522,300 +1962,213 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateGlossaryTerm(RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call CreateGlossaryTerm with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateGlossaryTerm and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new {};
-
-Response response = client.CreateGlossaryTerm(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateGlossaryTerm(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateGlossaryTerm with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateGlossaryTerm with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    abbreviation = "<abbreviation>",
-    templateName = new[] {
-        new {}
-    },
-    anchor = new {
-        displayText = "<displayText>",
-        glossaryGuid = "<glossaryGuid>",
-        relationGuid = "<relationGuid>",
-    },
-    antonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    createTime = 123.45f,
-    createdBy = "<createdBy>",
-    updateTime = 123.45f,
-    updatedBy = "<updatedBy>",
-    status = "Draft",
-    resources = new[] {
-        new {
-            displayName = "<displayName>",
-            url = "<url>",
-        }
-    },
-    contacts = new {
-        key = new[] {
-            new {
-                id = "<id>",
-                info = "<info>",
-            }
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["abbreviation"] = "<abbreviation>",
+    ["templateName"] = new List<object>()
+{
+new Dictionary<string, object>()
+},
+    ["anchor"] = new Dictionary<string, object>()
+    {
+        ["displayText"] = "<displayText>",
+        ["glossaryGuid"] = "<glossaryGuid>",
+        ["relationGuid"] = "<relationGuid>",
+    },
+    ["antonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+    ["createTime"] = 123.45F,
+    ["createdBy"] = "<createdBy>",
+    ["updateTime"] = 123.45F,
+    ["updatedBy"] = "<updatedBy>",
+    ["status"] = "Draft",
+    ["resources"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["url"] = "<url>",
+}
+},
+    ["contacts"] = new Dictionary<string, object>()
+    {
+        ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+    },
+    ["attributes"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
     },
-    attributes = new {
-        key = new {
-            key = new {},
-        },
-    },
-    assignedEntities = new[] {
-        new {
-            displayText = "<displayText>",
-            entityStatus = "ACTIVE",
-            relationshipType = "<relationshipType>",
-            relationshipAttributes = new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            },
-            relationshipGuid = "<relationshipGuid>",
-            relationshipStatus = "ACTIVE",
-            guid = "<guid>",
-            typeName = "<typeName>",
-            uniqueAttributes = new {
-                key = new {},
-            },
-        }
-    },
-    categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            relationGuid = "<relationGuid>",
-            status = "DRAFT",
-        }
-    },
-    classifies = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    examples = new[] {
-        "<String>"
-    },
-    isA = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    preferredTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    preferredToTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    replacedBy = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    replacementTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    seeAlso = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    synonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    translatedTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    translationTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    usage = "<usage>",
-    validValues = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    validValuesFor = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    longDescription = "<longDescription>",
-    name = "<name>",
-    qualifiedName = "<qualifiedName>",
-    shortDescription = "<shortDescription>",
-    lastModifiedTS = "<lastModifiedTS>",
-    guid = "<guid>",
-};
-
-Response response = client.CreateGlossaryTerm(RequestContent.Create(data), true);
+    ["assignedEntities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+},
+    ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["relationGuid"] = "<relationGuid>",
+["status"] = "DRAFT",
+}
+},
+    ["classifies"] = new List<object>()
+{
+null
+},
+    ["examples"] = new List<object>()
+{
+"<examples>"
+},
+    ["isA"] = new List<object>()
+{
+null
+},
+    ["preferredTerms"] = new List<object>()
+{
+null
+},
+    ["preferredToTerms"] = new List<object>()
+{
+null
+},
+    ["replacedBy"] = new List<object>()
+{
+null
+},
+    ["replacementTerms"] = new List<object>()
+{
+null
+},
+    ["seeAlso"] = new List<object>()
+{
+null
+},
+    ["synonyms"] = new List<object>()
+{
+null
+},
+    ["translatedTerms"] = new List<object>()
+{
+null
+},
+    ["translationTerms"] = new List<object>()
+{
+null
+},
+    ["usage"] = "<usage>",
+    ["validValues"] = new List<object>()
+{
+null
+},
+    ["validValuesFor"] = new List<object>()
+{
+null
+},
+    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["longDescription"] = "<longDescription>",
+    ["name"] = "<name>",
+    ["qualifiedName"] = "<qualifiedName>",
+    ["shortDescription"] = "<shortDescription>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+    ["guid"] = "<guid>",
+});
+Response response = client.CreateGlossaryTerm(content, includeTermHierarchy: true);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -2838,20 +2191,20 @@ Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -2962,8 +2315,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -2972,18 +2325,31 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGlossaryTermAsync(string,bool?,IEnumerable{string},RequestContext)">
-<example>
-This sample shows how to call GetGlossaryTermAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossaryTermAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetGlossaryTermAsync("<termGuid>", null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetGlossaryTermAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetGlossaryTermAsync("<termGuid>", true, new String[]{"<excludeRelationshipTypeList>"}, new RequestContext());
+Response response = await client.GetGlossaryTermAsync("<termGuid>", true, new List<string>()
+{
+"<excludeRelationshipTypeList>"
+}, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -3006,20 +2372,20 @@ Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -3130,8 +2496,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -3140,18 +2506,31 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGlossaryTerm(string,bool?,IEnumerable{string},RequestContext)">
-<example>
-This sample shows how to call GetGlossaryTerm with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossaryTerm and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetGlossaryTerm("<termGuid>", null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetGlossaryTerm with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetGlossaryTerm("<termGuid>", true, new String[]{"<excludeRelationshipTypeList>"}, new RequestContext());
+Response response = client.GetGlossaryTerm("<termGuid>", true, new List<string>()
+{
+"<excludeRelationshipTypeList>"
+}, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -3174,20 +2553,20 @@ Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -3298,8 +2677,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -3308,300 +2687,213 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateGlossaryTermAsync(string,RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call UpdateGlossaryTermAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call UpdateGlossaryTermAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new {};
-
-Response response = await client.UpdateGlossaryTermAsync("<termGuid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.UpdateGlossaryTermAsync("<termGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateGlossaryTermAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call UpdateGlossaryTermAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    abbreviation = "<abbreviation>",
-    templateName = new[] {
-        new {}
-    },
-    anchor = new {
-        displayText = "<displayText>",
-        glossaryGuid = "<glossaryGuid>",
-        relationGuid = "<relationGuid>",
-    },
-    antonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    createTime = 123.45f,
-    createdBy = "<createdBy>",
-    updateTime = 123.45f,
-    updatedBy = "<updatedBy>",
-    status = "Draft",
-    resources = new[] {
-        new {
-            displayName = "<displayName>",
-            url = "<url>",
-        }
-    },
-    contacts = new {
-        key = new[] {
-            new {
-                id = "<id>",
-                info = "<info>",
-            }
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["abbreviation"] = "<abbreviation>",
+    ["templateName"] = new List<object>()
+{
+new Dictionary<string, object>()
+},
+    ["anchor"] = new Dictionary<string, object>()
+    {
+        ["displayText"] = "<displayText>",
+        ["glossaryGuid"] = "<glossaryGuid>",
+        ["relationGuid"] = "<relationGuid>",
+    },
+    ["antonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+    ["createTime"] = 123.45F,
+    ["createdBy"] = "<createdBy>",
+    ["updateTime"] = 123.45F,
+    ["updatedBy"] = "<updatedBy>",
+    ["status"] = "Draft",
+    ["resources"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["url"] = "<url>",
+}
+},
+    ["contacts"] = new Dictionary<string, object>()
+    {
+        ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+    },
+    ["attributes"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
     },
-    attributes = new {
-        key = new {
-            key = new {},
-        },
-    },
-    assignedEntities = new[] {
-        new {
-            displayText = "<displayText>",
-            entityStatus = "ACTIVE",
-            relationshipType = "<relationshipType>",
-            relationshipAttributes = new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            },
-            relationshipGuid = "<relationshipGuid>",
-            relationshipStatus = "ACTIVE",
-            guid = "<guid>",
-            typeName = "<typeName>",
-            uniqueAttributes = new {
-                key = new {},
-            },
-        }
-    },
-    categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            relationGuid = "<relationGuid>",
-            status = "DRAFT",
-        }
-    },
-    classifies = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    examples = new[] {
-        "<String>"
-    },
-    isA = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    preferredTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    preferredToTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    replacedBy = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    replacementTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    seeAlso = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    synonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    translatedTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    translationTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    usage = "<usage>",
-    validValues = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    validValuesFor = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    longDescription = "<longDescription>",
-    name = "<name>",
-    qualifiedName = "<qualifiedName>",
-    shortDescription = "<shortDescription>",
-    lastModifiedTS = "<lastModifiedTS>",
-    guid = "<guid>",
-};
-
-Response response = await client.UpdateGlossaryTermAsync("<termGuid>", RequestContent.Create(data), true);
+    ["assignedEntities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+},
+    ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["relationGuid"] = "<relationGuid>",
+["status"] = "DRAFT",
+}
+},
+    ["classifies"] = new List<object>()
+{
+null
+},
+    ["examples"] = new List<object>()
+{
+"<examples>"
+},
+    ["isA"] = new List<object>()
+{
+null
+},
+    ["preferredTerms"] = new List<object>()
+{
+null
+},
+    ["preferredToTerms"] = new List<object>()
+{
+null
+},
+    ["replacedBy"] = new List<object>()
+{
+null
+},
+    ["replacementTerms"] = new List<object>()
+{
+null
+},
+    ["seeAlso"] = new List<object>()
+{
+null
+},
+    ["synonyms"] = new List<object>()
+{
+null
+},
+    ["translatedTerms"] = new List<object>()
+{
+null
+},
+    ["translationTerms"] = new List<object>()
+{
+null
+},
+    ["usage"] = "<usage>",
+    ["validValues"] = new List<object>()
+{
+null
+},
+    ["validValuesFor"] = new List<object>()
+{
+null
+},
+    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["longDescription"] = "<longDescription>",
+    ["name"] = "<name>",
+    ["qualifiedName"] = "<qualifiedName>",
+    ["shortDescription"] = "<shortDescription>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+    ["guid"] = "<guid>",
+});
+Response response = await client.UpdateGlossaryTermAsync("<termGuid>", content, includeTermHierarchy: true);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -3624,20 +2916,20 @@ Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -3748,8 +3040,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -3758,300 +3050,213 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateGlossaryTerm(string,RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call UpdateGlossaryTerm with required parameters and parse the result.
+      <example>
+This sample shows how to call UpdateGlossaryTerm and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new {};
-
-Response response = client.UpdateGlossaryTerm("<termGuid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.UpdateGlossaryTerm("<termGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateGlossaryTerm with all parameters and request content, and how to parse the result.
+This sample shows how to call UpdateGlossaryTerm with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    abbreviation = "<abbreviation>",
-    templateName = new[] {
-        new {}
-    },
-    anchor = new {
-        displayText = "<displayText>",
-        glossaryGuid = "<glossaryGuid>",
-        relationGuid = "<relationGuid>",
-    },
-    antonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    createTime = 123.45f,
-    createdBy = "<createdBy>",
-    updateTime = 123.45f,
-    updatedBy = "<updatedBy>",
-    status = "Draft",
-    resources = new[] {
-        new {
-            displayName = "<displayName>",
-            url = "<url>",
-        }
-    },
-    contacts = new {
-        key = new[] {
-            new {
-                id = "<id>",
-                info = "<info>",
-            }
-        },
-    },
-    attributes = new {
-        key = new {
-            key = new {},
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["abbreviation"] = "<abbreviation>",
+    ["templateName"] = new List<object>()
+{
+new Dictionary<string, object>()
+},
+    ["anchor"] = new Dictionary<string, object>()
+    {
+        ["displayText"] = "<displayText>",
+        ["glossaryGuid"] = "<glossaryGuid>",
+        ["relationGuid"] = "<relationGuid>",
+    },
+    ["antonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+    ["createTime"] = 123.45F,
+    ["createdBy"] = "<createdBy>",
+    ["updateTime"] = 123.45F,
+    ["updatedBy"] = "<updatedBy>",
+    ["status"] = "Draft",
+    ["resources"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["url"] = "<url>",
+}
+},
+    ["contacts"] = new Dictionary<string, object>()
+    {
+        ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+    },
+    ["attributes"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
     },
-    assignedEntities = new[] {
-        new {
-            displayText = "<displayText>",
-            entityStatus = "ACTIVE",
-            relationshipType = "<relationshipType>",
-            relationshipAttributes = new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            },
-            relationshipGuid = "<relationshipGuid>",
-            relationshipStatus = "ACTIVE",
-            guid = "<guid>",
-            typeName = "<typeName>",
-            uniqueAttributes = new {
-                key = new {},
-            },
-        }
-    },
-    categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            relationGuid = "<relationGuid>",
-            status = "DRAFT",
-        }
-    },
-    classifies = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    examples = new[] {
-        "<String>"
-    },
-    isA = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    preferredTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    preferredToTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    replacedBy = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    replacementTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    seeAlso = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    synonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    translatedTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    translationTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    usage = "<usage>",
-    validValues = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    validValuesFor = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    longDescription = "<longDescription>",
-    name = "<name>",
-    qualifiedName = "<qualifiedName>",
-    shortDescription = "<shortDescription>",
-    lastModifiedTS = "<lastModifiedTS>",
-    guid = "<guid>",
-};
-
-Response response = client.UpdateGlossaryTerm("<termGuid>", RequestContent.Create(data), true);
+    ["assignedEntities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+},
+    ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["relationGuid"] = "<relationGuid>",
+["status"] = "DRAFT",
+}
+},
+    ["classifies"] = new List<object>()
+{
+null
+},
+    ["examples"] = new List<object>()
+{
+"<examples>"
+},
+    ["isA"] = new List<object>()
+{
+null
+},
+    ["preferredTerms"] = new List<object>()
+{
+null
+},
+    ["preferredToTerms"] = new List<object>()
+{
+null
+},
+    ["replacedBy"] = new List<object>()
+{
+null
+},
+    ["replacementTerms"] = new List<object>()
+{
+null
+},
+    ["seeAlso"] = new List<object>()
+{
+null
+},
+    ["synonyms"] = new List<object>()
+{
+null
+},
+    ["translatedTerms"] = new List<object>()
+{
+null
+},
+    ["translationTerms"] = new List<object>()
+{
+null
+},
+    ["usage"] = "<usage>",
+    ["validValues"] = new List<object>()
+{
+null
+},
+    ["validValuesFor"] = new List<object>()
+{
+null
+},
+    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["longDescription"] = "<longDescription>",
+    ["name"] = "<name>",
+    ["qualifiedName"] = "<qualifiedName>",
+    ["shortDescription"] = "<shortDescription>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+    ["guid"] = "<guid>",
+});
+Response response = client.UpdateGlossaryTerm("<termGuid>", content, includeTermHierarchy: true);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -4074,20 +3279,20 @@ Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -4198,8 +3403,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -4208,63 +3413,78 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteGlossaryTermAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteGlossaryTermAsync with required parameters.
+      <example>
+This sample shows how to call DeleteGlossaryTermAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
 Response response = await client.DeleteGlossaryTermAsync("<termGuid>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteGlossaryTermAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.DeleteGlossaryTermAsync("<termGuid>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteGlossaryTerm(string,RequestContext)">
-<example>
-This sample shows how to call DeleteGlossaryTerm with required parameters.
+      <example>
+This sample shows how to call DeleteGlossaryTerm.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
 Response response = client.DeleteGlossaryTerm("<termGuid>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteGlossaryTerm with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.DeleteGlossaryTerm("<termGuid>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="PartialUpdateGlossaryTermAsync(string,RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call PartialUpdateGlossaryTermAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call PartialUpdateGlossaryTermAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    key = "<String>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.PartialUpdateGlossaryTermAsync("<termGuid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = "<partialUpdates>",
+});
+Response response = await client.PartialUpdateGlossaryTermAsync("<termGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call PartialUpdateGlossaryTermAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call PartialUpdateGlossaryTermAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new {
-    key = "<String>",
-};
-
-Response response = await client.PartialUpdateGlossaryTermAsync("<termGuid>", RequestContent.Create(data), true);
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = "<partialUpdates>",
+});
+Response response = await client.PartialUpdateGlossaryTermAsync("<termGuid>", content, includeTermHierarchy: true);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -4287,20 +3507,20 @@ Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -4411,8 +3631,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -4421,37 +3641,36 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="PartialUpdateGlossaryTerm(string,RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call PartialUpdateGlossaryTerm with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call PartialUpdateGlossaryTerm and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new {
-    key = "<String>",
-};
-
-Response response = client.PartialUpdateGlossaryTerm("<termGuid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = "<partialUpdates>",
+});
+Response response = client.PartialUpdateGlossaryTerm("<termGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call PartialUpdateGlossaryTerm with all parameters and request content, and how to parse the result.
+This sample shows how to call PartialUpdateGlossaryTerm with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    key = "<String>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.PartialUpdateGlossaryTerm("<termGuid>", RequestContent.Create(data), true);
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = "<partialUpdates>",
+});
+Response response = client.PartialUpdateGlossaryTerm("<termGuid>", content, includeTermHierarchy: true);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -4474,20 +3693,20 @@ Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
 Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -4598,8 +3817,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -4608,304 +3827,219 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateGlossaryTermsAsync(RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call CreateGlossaryTermsAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateGlossaryTermsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new[] {
-    new {}
-};
-
-Response response = await client.CreateGlossaryTermsAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = await client.CreateGlossaryTermsAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].ToString());
 ]]></code>
-This sample shows how to call CreateGlossaryTermsAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateGlossaryTermsAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new[] {
-    new {
-        abbreviation = "<abbreviation>",
-        templateName = new[] {
-            new {}
-        },
-        anchor = new {
-            displayText = "<displayText>",
-            glossaryGuid = "<glossaryGuid>",
-            relationGuid = "<relationGuid>",
-        },
-        antonyms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        createTime = 123.45f,
-        createdBy = "<createdBy>",
-        updateTime = 123.45f,
-        updatedBy = "<updatedBy>",
-        status = "Draft",
-        resources = new[] {
-            new {
-                displayName = "<displayName>",
-                url = "<url>",
-            }
-        },
-        contacts = new {
-            key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
-        },
-        attributes = new {
-            key = new {
-                key = new {},
-            },
-        },
-        assignedEntities = new[] {
-            new {
-                displayText = "<displayText>",
-                entityStatus = "ACTIVE",
-                relationshipType = "<relationshipType>",
-                relationshipAttributes = new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                },
-                relationshipGuid = "<relationshipGuid>",
-                relationshipStatus = "ACTIVE",
-                guid = "<guid>",
-                typeName = "<typeName>",
-                uniqueAttributes = new {
-                    key = new {},
-                },
-            }
-        },
-        categories = new[] {
-            new {
-                categoryGuid = "<categoryGuid>",
-                description = "<description>",
-                displayText = "<displayText>",
-                relationGuid = "<relationGuid>",
-                status = "DRAFT",
-            }
-        },
-        classifies = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        examples = new[] {
-            "<String>"
-        },
-        isA = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        preferredTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        preferredToTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        replacedBy = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        replacementTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        seeAlso = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        synonyms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        translatedTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        translationTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        usage = "<usage>",
-        validValues = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        validValuesFor = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-        longDescription = "<longDescription>",
-        name = "<name>",
-        qualifiedName = "<qualifiedName>",
-        shortDescription = "<shortDescription>",
-        lastModifiedTS = "<lastModifiedTS>",
-        guid = "<guid>",
-    }
-};
-
-Response response = await client.CreateGlossaryTermsAsync(RequestContent.Create(data), true);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["abbreviation"] = "<abbreviation>",
+["templateName"] = new List<object>()
+{
+new Dictionary<string, object>()
+},
+["anchor"] = new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["glossaryGuid"] = "<glossaryGuid>",
+["relationGuid"] = "<relationGuid>",
+},
+["antonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["status"] = "Draft",
+["resources"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["url"] = "<url>",
+}
+},
+["contacts"] = new Dictionary<string, object>()
+{
+["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+},
+["assignedEntities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+},
+["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["relationGuid"] = "<relationGuid>",
+["status"] = "DRAFT",
+}
+},
+["classifies"] = new List<object>()
+{
+null
+},
+["examples"] = new List<object>()
+{
+"<examples>"
+},
+["isA"] = new List<object>()
+{
+null
+},
+["preferredTerms"] = new List<object>()
+{
+null
+},
+["preferredToTerms"] = new List<object>()
+{
+null
+},
+["replacedBy"] = new List<object>()
+{
+null
+},
+["replacementTerms"] = new List<object>()
+{
+null
+},
+["seeAlso"] = new List<object>()
+{
+null
+},
+["synonyms"] = new List<object>()
+{
+null
+},
+["translatedTerms"] = new List<object>()
+{
+null
+},
+["translationTerms"] = new List<object>()
+{
+null
+},
+["usage"] = "<usage>",
+["validValues"] = new List<object>()
+{
+null
+},
+["validValuesFor"] = new List<object>()
+{
+null
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["longDescription"] = "<longDescription>",
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+["shortDescription"] = "<shortDescription>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+["guid"] = "<guid>",
+}
+});
+Response response = await client.CreateGlossaryTermsAsync(content, includeTermHierarchy: true);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("abbreviation").ToString());
@@ -4928,20 +4062,20 @@ Console.WriteLine(result[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result[0].GetProperty("status").ToString());
 Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("displayName").ToString());
 Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -5052,8 +4186,8 @@ Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("valid
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -5062,304 +4196,219 @@ Console.WriteLine(result[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result[0].GetProperty("shortDescription").ToString());
 Console.WriteLine(result[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateGlossaryTerms(RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call CreateGlossaryTerms with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateGlossaryTerms and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new[] {
-    new {}
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.CreateGlossaryTerms(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = client.CreateGlossaryTerms(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].ToString());
 ]]></code>
-This sample shows how to call CreateGlossaryTerms with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateGlossaryTerms with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new[] {
-    new {
-        abbreviation = "<abbreviation>",
-        templateName = new[] {
-            new {}
-        },
-        anchor = new {
-            displayText = "<displayText>",
-            glossaryGuid = "<glossaryGuid>",
-            relationGuid = "<relationGuid>",
-        },
-        antonyms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        createTime = 123.45f,
-        createdBy = "<createdBy>",
-        updateTime = 123.45f,
-        updatedBy = "<updatedBy>",
-        status = "Draft",
-        resources = new[] {
-            new {
-                displayName = "<displayName>",
-                url = "<url>",
-            }
-        },
-        contacts = new {
-            key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
-        },
-        attributes = new {
-            key = new {
-                key = new {},
-            },
-        },
-        assignedEntities = new[] {
-            new {
-                displayText = "<displayText>",
-                entityStatus = "ACTIVE",
-                relationshipType = "<relationshipType>",
-                relationshipAttributes = new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                },
-                relationshipGuid = "<relationshipGuid>",
-                relationshipStatus = "ACTIVE",
-                guid = "<guid>",
-                typeName = "<typeName>",
-                uniqueAttributes = new {
-                    key = new {},
-                },
-            }
-        },
-        categories = new[] {
-            new {
-                categoryGuid = "<categoryGuid>",
-                description = "<description>",
-                displayText = "<displayText>",
-                relationGuid = "<relationGuid>",
-                status = "DRAFT",
-            }
-        },
-        classifies = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        examples = new[] {
-            "<String>"
-        },
-        isA = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        preferredTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        preferredToTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        replacedBy = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        replacementTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        seeAlso = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        synonyms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        translatedTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        translationTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        usage = "<usage>",
-        validValues = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        validValuesFor = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-        longDescription = "<longDescription>",
-        name = "<name>",
-        qualifiedName = "<qualifiedName>",
-        shortDescription = "<shortDescription>",
-        lastModifiedTS = "<lastModifiedTS>",
-        guid = "<guid>",
-    }
-};
-
-Response response = client.CreateGlossaryTerms(RequestContent.Create(data), true);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["abbreviation"] = "<abbreviation>",
+["templateName"] = new List<object>()
+{
+new Dictionary<string, object>()
+},
+["anchor"] = new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["glossaryGuid"] = "<glossaryGuid>",
+["relationGuid"] = "<relationGuid>",
+},
+["antonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["status"] = "Draft",
+["resources"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["url"] = "<url>",
+}
+},
+["contacts"] = new Dictionary<string, object>()
+{
+["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+},
+["assignedEntities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+},
+["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["relationGuid"] = "<relationGuid>",
+["status"] = "DRAFT",
+}
+},
+["classifies"] = new List<object>()
+{
+null
+},
+["examples"] = new List<object>()
+{
+"<examples>"
+},
+["isA"] = new List<object>()
+{
+null
+},
+["preferredTerms"] = new List<object>()
+{
+null
+},
+["preferredToTerms"] = new List<object>()
+{
+null
+},
+["replacedBy"] = new List<object>()
+{
+null
+},
+["replacementTerms"] = new List<object>()
+{
+null
+},
+["seeAlso"] = new List<object>()
+{
+null
+},
+["synonyms"] = new List<object>()
+{
+null
+},
+["translatedTerms"] = new List<object>()
+{
+null
+},
+["translationTerms"] = new List<object>()
+{
+null
+},
+["usage"] = "<usage>",
+["validValues"] = new List<object>()
+{
+null
+},
+["validValuesFor"] = new List<object>()
+{
+null
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["longDescription"] = "<longDescription>",
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+["shortDescription"] = "<shortDescription>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+["guid"] = "<guid>",
+}
+});
+Response response = client.CreateGlossaryTerms(content, includeTermHierarchy: true);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("abbreviation").ToString());
@@ -5382,20 +4431,20 @@ Console.WriteLine(result[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result[0].GetProperty("status").ToString());
 Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("displayName").ToString());
 Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -5506,8 +4555,8 @@ Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("valid
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -5516,406 +4565,468 @@ Console.WriteLine(result[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result[0].GetProperty("shortDescription").ToString());
 Console.WriteLine(result[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetEntitiesAssignedWithTermAsync(string,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetEntitiesAssignedWithTermAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEntitiesAssignedWithTermAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetEntitiesAssignedWithTermAsync("<termGuid>", 1234, 1234, "<sort>", new RequestContext());
+Response response = await client.GetEntitiesAssignedWithTermAsync("<termGuid>", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetEntitiesAssignedWithTermAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetEntitiesAssignedWithTermAsync("<termGuid>", 1234, 1234, "<sort>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("displayText").ToString());
 Console.WriteLine(result[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
 Console.WriteLine(result[0].GetProperty("typeName").ToString());
-Console.WriteLine(result[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="GetEntitiesAssignedWithTerm(string,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetEntitiesAssignedWithTerm with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEntitiesAssignedWithTerm and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetEntitiesAssignedWithTerm("<termGuid>", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetEntitiesAssignedWithTerm with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetEntitiesAssignedWithTerm("<termGuid>", 1234, 1234, "<sort>", new RequestContext());
+Response response = client.GetEntitiesAssignedWithTerm("<termGuid>", 1234, 1234, "<sort>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("displayText").ToString());
 Console.WriteLine(result[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
 Console.WriteLine(result[0].GetProperty("typeName").ToString());
-Console.WriteLine(result[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
-]]></code>
-</example>
+Console.WriteLine(result[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
+]]></code></example>
     </member>
     <member name="AssignTermToEntitiesAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call AssignTermToEntitiesAsync with required parameters and request content.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new[] {
-    new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    }
-};
-
-Response response = await client.AssignTermToEntitiesAsync("<termGuid>", RequestContent.Create(data));
+      <example>
+This sample shows how to call AssignTermToEntitiesAsync.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = await client.AssignTermToEntitiesAsync("<termGuid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call AssignTermToEntitiesAsync with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+});
+Response response = await client.AssignTermToEntitiesAsync("<termGuid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="AssignTermToEntities(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call AssignTermToEntities with required parameters and request content.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new[] {
-    new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    }
-};
-
-Response response = client.AssignTermToEntities("<termGuid>", RequestContent.Create(data));
+      <example>
+This sample shows how to call AssignTermToEntities.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = client.AssignTermToEntities("<termGuid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call AssignTermToEntities with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+});
+Response response = client.AssignTermToEntities("<termGuid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="RemoveTermAssignmentFromEntitiesAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call RemoveTermAssignmentFromEntitiesAsync with required parameters and request content.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new[] {
-    new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    }
-};
-
-Response response = await client.RemoveTermAssignmentFromEntitiesAsync("<termGuid>", RequestContent.Create(data));
+      <example>
+This sample shows how to call RemoveTermAssignmentFromEntitiesAsync.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = await client.RemoveTermAssignmentFromEntitiesAsync("<termGuid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call RemoveTermAssignmentFromEntitiesAsync with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+});
+Response response = await client.RemoveTermAssignmentFromEntitiesAsync("<termGuid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="RemoveTermAssignmentFromEntities(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call RemoveTermAssignmentFromEntities with required parameters and request content.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new[] {
-    new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    }
-};
-
-Response response = client.RemoveTermAssignmentFromEntities("<termGuid>", RequestContent.Create(data));
+      <example>
+This sample shows how to call RemoveTermAssignmentFromEntities.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = client.RemoveTermAssignmentFromEntities("<termGuid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call RemoveTermAssignmentFromEntities with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+});
+Response response = client.RemoveTermAssignmentFromEntities("<termGuid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteTermAssignmentFromEntitiesAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DeleteTermAssignmentFromEntitiesAsync with required parameters and request content.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new[] {
-    new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    }
-};
-
-Response response = await client.DeleteTermAssignmentFromEntitiesAsync("<termGuid>", RequestContent.Create(data));
+      <example>
+This sample shows how to call DeleteTermAssignmentFromEntitiesAsync.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = await client.DeleteTermAssignmentFromEntitiesAsync("<termGuid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteTermAssignmentFromEntitiesAsync with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+});
+Response response = await client.DeleteTermAssignmentFromEntitiesAsync("<termGuid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteTermAssignmentFromEntities(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call DeleteTermAssignmentFromEntities with required parameters and request content.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new[] {
-    new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    }
-};
-
-Response response = client.DeleteTermAssignmentFromEntities("<termGuid>", RequestContent.Create(data));
+      <example>
+This sample shows how to call DeleteTermAssignmentFromEntities.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+Response response = client.DeleteTermAssignmentFromEntities("<termGuid>", content);
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteTermAssignmentFromEntities with all parameters and request content.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+});
+Response response = client.DeleteTermAssignmentFromEntities("<termGuid>", content);
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetRelatedTermsAsync(string,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetRelatedTermsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRelatedTermsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetRelatedTermsAsync("<termGuid>", 1234, 1234, "<sort>", new RequestContext());
+Response response = await client.GetRelatedTermsAsync("<termGuid>", null, null, null, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].ToString());
 ]]></code>
-</example>
+This sample shows how to call GetRelatedTermsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetRelatedTermsAsync("<termGuid>", 1234, 1234, "<sort>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("termGuid").ToString());
+]]></code></example>
     </member>
     <member name="GetRelatedTerms(string,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetRelatedTerms with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRelatedTerms and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetRelatedTerms("<termGuid>", 1234, 1234, "<sort>", new RequestContext());
+Response response = client.GetRelatedTerms("<termGuid>", null, null, null, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].ToString());
 ]]></code>
-</example>
+This sample shows how to call GetRelatedTerms with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetRelatedTerms("<termGuid>", 1234, 1234, "<sort>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("termGuid").ToString());
+]]></code></example>
     </member>
     <member name="GetGlossaryAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetGlossaryAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossaryAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetGlossaryAsync("<glossaryGuid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetGlossaryAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetGlossaryAsync("<glossaryGuid>", new RequestContext());
+Response response = await client.GetGlossaryAsync("<glossaryGuid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -5940,8 +5051,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -5950,18 +5061,28 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGlossary(string,RequestContext)">
-<example>
-This sample shows how to call GetGlossary with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossary and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetGlossary("<glossaryGuid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetGlossary with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetGlossary("<glossaryGuid>", new RequestContext());
+Response response = client.GetGlossary("<glossaryGuid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -5986,8 +5107,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -5996,422 +5117,94 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateGlossaryAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateGlossaryAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call UpdateGlossaryAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.UpdateGlossaryAsync("<glossaryGuid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.UpdateGlossaryAsync("<glossaryGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateGlossaryAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    categoryInfo = new {
-        key = new {
-            anchor = new {
-                displayText = "<displayText>",
-                glossaryGuid = "<glossaryGuid>",
-                relationGuid = "<relationGuid>",
-            },
-            childrenCategories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    parentCategoryGuid = "<parentCategoryGuid>",
-                    relationGuid = "<relationGuid>",
-                }
-            },
-            parentCategory = new {
-                categoryGuid = "<categoryGuid>",
-                description = "<description>",
-                displayText = "<displayText>",
-                parentCategoryGuid = "<parentCategoryGuid>",
-                relationGuid = "<relationGuid>",
-            },
-            terms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            longDescription = "<longDescription>",
-            name = "<name>",
-            qualifiedName = "<qualifiedName>",
-            shortDescription = "<shortDescription>",
-            lastModifiedTS = "<lastModifiedTS>",
-            guid = "<guid>",
-        },
-    },
-    termInfo = new {
-        key = new {
-            abbreviation = "<abbreviation>",
-            templateName = new[] {
-                new {}
-            },
-            anchor = new {
-                displayText = "<displayText>",
-                glossaryGuid = "<glossaryGuid>",
-                relationGuid = "<relationGuid>",
-            },
-            antonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            status = "Draft",
-            resources = new[] {
-                new {
-                    displayName = "<displayName>",
-                    url = "<url>",
-                }
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {
-                    key = new {},
-                },
-            },
-            assignedEntities = new[] {
-                new {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                            new {
-                                endTime = "<endTime>",
-                                startTime = "<startTime>",
-                                timeZone = "<timeZone>",
-                            }
-                        },
-                        source = "<source>",
-                        sourceDetails = new {
-                            key = new {},
-                        },
-                        attributes = new {
-                            key = new {},
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new {
-                        key = new {},
-                    },
-                }
-            },
-            categories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    relationGuid = "<relationGuid>",
-                    status = "DRAFT",
-                }
-            },
-            classifies = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            examples = new[] {
-                "<String>"
-            },
-            isA = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            preferredTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            preferredToTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            replacedBy = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            replacementTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            seeAlso = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            synonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            translatedTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            translationTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            usage = "<usage>",
-            validValues = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            validValuesFor = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            longDescription = "<longDescription>",
-            name = "<name>",
-            qualifiedName = "<qualifiedName>",
-            shortDescription = "<shortDescription>",
-            lastModifiedTS = "<lastModifiedTS>",
-            guid = "<guid>",
-        },
-    },
-    categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-    language = "<language>",
-    terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    usage = "<usage>",
-    classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    longDescription = "<longDescription>",
-    name = "<name>",
-    qualifiedName = "<qualifiedName>",
-    shortDescription = "<shortDescription>",
-    lastModifiedTS = "<lastModifiedTS>",
-    guid = "<guid>",
-};
-
-Response response = await client.UpdateGlossaryAsync("<glossaryGuid>", RequestContent.Create(data));
+This sample shows how to call UpdateGlossaryAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+    ["language"] = "<language>",
+    ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+    ["usage"] = "<usage>",
+    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["longDescription"] = "<longDescription>",
+    ["name"] = "<name>",
+    ["qualifiedName"] = "<qualifiedName>",
+    ["shortDescription"] = "<shortDescription>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+    ["guid"] = "<guid>",
+});
+Response response = await client.UpdateGlossaryAsync("<glossaryGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -6436,8 +5229,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -6446,422 +5239,94 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateGlossary(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateGlossary with required parameters and parse the result.
+      <example>
+This sample shows how to call UpdateGlossary and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new {};
-
-Response response = client.UpdateGlossary("<glossaryGuid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.UpdateGlossary("<glossaryGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateGlossary with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    categoryInfo = new {
-        key = new {
-            anchor = new {
-                displayText = "<displayText>",
-                glossaryGuid = "<glossaryGuid>",
-                relationGuid = "<relationGuid>",
-            },
-            childrenCategories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    parentCategoryGuid = "<parentCategoryGuid>",
-                    relationGuid = "<relationGuid>",
-                }
-            },
-            parentCategory = new {
-                categoryGuid = "<categoryGuid>",
-                description = "<description>",
-                displayText = "<displayText>",
-                parentCategoryGuid = "<parentCategoryGuid>",
-                relationGuid = "<relationGuid>",
-            },
-            terms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            longDescription = "<longDescription>",
-            name = "<name>",
-            qualifiedName = "<qualifiedName>",
-            shortDescription = "<shortDescription>",
-            lastModifiedTS = "<lastModifiedTS>",
-            guid = "<guid>",
-        },
-    },
-    termInfo = new {
-        key = new {
-            abbreviation = "<abbreviation>",
-            templateName = new[] {
-                new {}
-            },
-            anchor = new {
-                displayText = "<displayText>",
-                glossaryGuid = "<glossaryGuid>",
-                relationGuid = "<relationGuid>",
-            },
-            antonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            status = "Draft",
-            resources = new[] {
-                new {
-                    displayName = "<displayName>",
-                    url = "<url>",
-                }
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {
-                    key = new {},
-                },
-            },
-            assignedEntities = new[] {
-                new {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                            new {
-                                endTime = "<endTime>",
-                                startTime = "<startTime>",
-                                timeZone = "<timeZone>",
-                            }
-                        },
-                        source = "<source>",
-                        sourceDetails = new {
-                            key = new {},
-                        },
-                        attributes = new {
-                            key = new {},
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new {
-                        key = new {},
-                    },
-                }
-            },
-            categories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    relationGuid = "<relationGuid>",
-                    status = "DRAFT",
-                }
-            },
-            classifies = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            examples = new[] {
-                "<String>"
-            },
-            isA = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            preferredTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            preferredToTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            replacedBy = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            replacementTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            seeAlso = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            synonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            translatedTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            translationTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            usage = "<usage>",
-            validValues = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            validValuesFor = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            longDescription = "<longDescription>",
-            name = "<name>",
-            qualifiedName = "<qualifiedName>",
-            shortDescription = "<shortDescription>",
-            lastModifiedTS = "<lastModifiedTS>",
-            guid = "<guid>",
-        },
-    },
-    categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-    language = "<language>",
-    terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-    usage = "<usage>",
-    classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    longDescription = "<longDescription>",
-    name = "<name>",
-    qualifiedName = "<qualifiedName>",
-    shortDescription = "<shortDescription>",
-    lastModifiedTS = "<lastModifiedTS>",
-    guid = "<guid>",
-};
-
-Response response = client.UpdateGlossary("<glossaryGuid>", RequestContent.Create(data));
+This sample shows how to call UpdateGlossary with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+    ["language"] = "<language>",
+    ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+    ["usage"] = "<usage>",
+    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["longDescription"] = "<longDescription>",
+    ["name"] = "<name>",
+    ["qualifiedName"] = "<qualifiedName>",
+    ["shortDescription"] = "<shortDescription>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+    ["guid"] = "<guid>",
+});
+Response response = client.UpdateGlossary("<glossaryGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -6886,8 +5351,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -6896,44 +5361,70 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteGlossaryAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteGlossaryAsync with required parameters.
+      <example>
+This sample shows how to call DeleteGlossaryAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
 Response response = await client.DeleteGlossaryAsync("<glossaryGuid>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteGlossaryAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.DeleteGlossaryAsync("<glossaryGuid>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteGlossary(string,RequestContext)">
-<example>
-This sample shows how to call DeleteGlossary with required parameters.
+      <example>
+This sample shows how to call DeleteGlossary.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
 Response response = client.DeleteGlossary("<glossaryGuid>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteGlossary with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.DeleteGlossary("<glossaryGuid>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetGlossaryCategoriesAsync(string,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetGlossaryCategoriesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossaryCategoriesAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetGlossaryCategoriesAsync("<glossaryGuid>", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetGlossaryCategoriesAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetGlossaryCategoriesAsync("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+Response response = await client.GetGlossaryCategoriesAsync("<glossaryGuid>", 1234, 1234, "<sort>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("anchor").GetProperty("displayText").ToString());
@@ -6964,8 +5455,8 @@ Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("valid
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -6974,18 +5465,28 @@ Console.WriteLine(result[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result[0].GetProperty("shortDescription").ToString());
 Console.WriteLine(result[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGlossaryCategories(string,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetGlossaryCategories with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossaryCategories and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetGlossaryCategories("<glossaryGuid>", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetGlossaryCategories with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetGlossaryCategories("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+Response response = client.GetGlossaryCategories("<glossaryGuid>", 1234, 1234, "<sort>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("anchor").GetProperty("displayText").ToString());
@@ -7016,8 +5517,8 @@ Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("valid
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -7026,18 +5527,28 @@ Console.WriteLine(result[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result[0].GetProperty("shortDescription").ToString());
 Console.WriteLine(result[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGlossaryCategoriesHeadersAsync(string,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetGlossaryCategoriesHeadersAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossaryCategoriesHeadersAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetGlossaryCategoriesHeadersAsync("<glossaryGuid>", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetGlossaryCategoriesHeadersAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetGlossaryCategoriesHeadersAsync("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+Response response = await client.GetGlossaryCategoriesHeadersAsync("<glossaryGuid>", 1234, 1234, "<sort>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("categoryGuid").ToString());
@@ -7045,18 +5556,28 @@ Console.WriteLine(result[0].GetProperty("description").ToString());
 Console.WriteLine(result[0].GetProperty("displayText").ToString());
 Console.WriteLine(result[0].GetProperty("parentCategoryGuid").ToString());
 Console.WriteLine(result[0].GetProperty("relationGuid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGlossaryCategoriesHeaders(string,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetGlossaryCategoriesHeaders with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossaryCategoriesHeaders and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetGlossaryCategoriesHeaders("<glossaryGuid>", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetGlossaryCategoriesHeaders with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetGlossaryCategoriesHeaders("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+Response response = client.GetGlossaryCategoriesHeaders("<glossaryGuid>", 1234, 1234, "<sort>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("categoryGuid").ToString());
@@ -7064,212 +5585,222 @@ Console.WriteLine(result[0].GetProperty("description").ToString());
 Console.WriteLine(result[0].GetProperty("displayText").ToString());
 Console.WriteLine(result[0].GetProperty("parentCategoryGuid").ToString());
 Console.WriteLine(result[0].GetProperty("relationGuid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDetailedGlossaryAsync(string,bool?,RequestContext)">
-<example>
-This sample shows how to call GetDetailedGlossaryAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDetailedGlossaryAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetDetailedGlossaryAsync("<glossaryGuid>", true, new RequestContext());
+Response response = await client.GetDetailedGlossaryAsync("<glossaryGuid>", null, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("categoryGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("parentCategoryGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("categoryGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("parentCategoryGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("longDescription").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("qualifiedName").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("shortDescription").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("abbreviation").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("templateName")[0].ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("createTime").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("updateTime").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("updatedBy").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("resources")[0].GetProperty("displayName").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("examples")[0].ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("usage").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("longDescription").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("qualifiedName").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("shortDescription").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("guid").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetDetailedGlossaryAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetDetailedGlossaryAsync("<glossaryGuid>", true, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("categoryGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("parentCategoryGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("categoryGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("parentCategoryGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("longDescription").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("qualifiedName").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("shortDescription").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("abbreviation").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("templateName")[0].ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("createTime").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("updateTime").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("updatedBy").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("resources")[0].GetProperty("displayName").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("resources")[0].GetProperty("url").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("examples")[0].ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("usage").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("longDescription").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("qualifiedName").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("shortDescription").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -7292,8 +5823,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -7302,212 +5833,222 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetDetailedGlossary(string,bool?,RequestContext)">
-<example>
-This sample shows how to call GetDetailedGlossary with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDetailedGlossary and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetDetailedGlossary("<glossaryGuid>", null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetDetailedGlossary with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetDetailedGlossary("<glossaryGuid>", true, new RequestContext());
+Response response = client.GetDetailedGlossary("<glossaryGuid>", true, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("categoryGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("parentCategoryGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("categoryGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("parentCategoryGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("longDescription").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("qualifiedName").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("shortDescription").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("abbreviation").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("templateName")[0].ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("createTime").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("updateTime").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("updatedBy").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("resources")[0].GetProperty("displayName").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("examples")[0].ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("usage").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("longDescription").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("qualifiedName").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("shortDescription").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("categoryGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("parentCategoryGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("categoryGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("parentCategoryGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("longDescription").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("qualifiedName").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("shortDescription").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("abbreviation").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("templateName")[0].ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("createTime").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("updateTime").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("updatedBy").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("resources")[0].GetProperty("displayName").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("resources")[0].GetProperty("url").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("examples")[0].ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("usage").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("longDescription").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("qualifiedName").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("shortDescription").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -7530,8 +6071,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -7540,37 +6081,36 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="PartialUpdateGlossaryAsync(string,RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call PartialUpdateGlossaryAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call PartialUpdateGlossaryAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    key = "<String>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.PartialUpdateGlossaryAsync("<glossaryGuid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = "<partialUpdates>",
+});
+Response response = await client.PartialUpdateGlossaryAsync("<glossaryGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call PartialUpdateGlossaryAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call PartialUpdateGlossaryAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new {
-    key = "<String>",
-};
-
-Response response = await client.PartialUpdateGlossaryAsync("<glossaryGuid>", RequestContent.Create(data), true);
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = "<partialUpdates>",
+});
+Response response = await client.PartialUpdateGlossaryAsync("<glossaryGuid>", content, includeTermHierarchy: true);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -7595,8 +6135,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -7605,37 +6145,36 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="PartialUpdateGlossary(string,RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call PartialUpdateGlossary with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call PartialUpdateGlossary and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new {
-    key = "<String>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.PartialUpdateGlossary("<glossaryGuid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = "<partialUpdates>",
+});
+Response response = client.PartialUpdateGlossary("<glossaryGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call PartialUpdateGlossary with all parameters and request content, and how to parse the result.
+This sample shows how to call PartialUpdateGlossary with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new {
-    key = "<String>",
-};
-
-Response response = client.PartialUpdateGlossary("<glossaryGuid>", RequestContent.Create(data), true);
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["key"] = "<partialUpdates>",
+});
+Response response = client.PartialUpdateGlossary("<glossaryGuid>", content, includeTermHierarchy: true);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -7660,8 +6199,8 @@ Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validity
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -7670,18 +6209,28 @@ Console.WriteLine(result.GetProperty("qualifiedName").ToString());
 Console.WriteLine(result.GetProperty("shortDescription").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGlossaryTermsAsync(string,bool?,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetGlossaryTermsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossaryTermsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetGlossaryTermsAsync("<glossaryGuid>", true, 1234, 1234, "<sort>", new RequestContext());
+Response response = await client.GetGlossaryTermsAsync("<glossaryGuid>", null, null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetGlossaryTermsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetGlossaryTermsAsync("<glossaryGuid>", true, 1234, 1234, "<sort>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("abbreviation").ToString());
@@ -7704,20 +6253,20 @@ Console.WriteLine(result[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result[0].GetProperty("status").ToString());
 Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("displayName").ToString());
 Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -7828,8 +6377,8 @@ Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("valid
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -7838,18 +6387,28 @@ Console.WriteLine(result[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result[0].GetProperty("shortDescription").ToString());
 Console.WriteLine(result[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGlossaryTerms(string,bool?,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetGlossaryTerms with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossaryTerms and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetGlossaryTerms("<glossaryGuid>", null, null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetGlossaryTerms with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetGlossaryTerms("<glossaryGuid>", true, 1234, 1234, "<sort>", new RequestContext());
+Response response = client.GetGlossaryTerms("<glossaryGuid>", true, 1234, 1234, "<sort>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("abbreviation").ToString());
@@ -7872,20 +6431,20 @@ Console.WriteLine(result[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result[0].GetProperty("status").ToString());
 Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("displayName").ToString());
 Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -7996,8 +6555,8 @@ Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("valid
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -8006,18 +6565,28 @@ Console.WriteLine(result[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result[0].GetProperty("shortDescription").ToString());
 Console.WriteLine(result[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGlossaryTermHeadersAsync(string,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetGlossaryTermHeadersAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossaryTermHeadersAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetGlossaryTermHeadersAsync("<glossaryGuid>", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetGlossaryTermHeadersAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetGlossaryTermHeadersAsync("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+Response response = await client.GetGlossaryTermHeadersAsync("<glossaryGuid>", 1234, 1234, "<sort>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("description").ToString());
@@ -8028,18 +6597,28 @@ Console.WriteLine(result[0].GetProperty("source").ToString());
 Console.WriteLine(result[0].GetProperty("status").ToString());
 Console.WriteLine(result[0].GetProperty("steward").ToString());
 Console.WriteLine(result[0].GetProperty("termGuid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetGlossaryTermHeaders(string,int?,int?,string,RequestContext)">
-<example>
-This sample shows how to call GetGlossaryTermHeaders with required parameters and parse the result.
+      <example>
+This sample shows how to call GetGlossaryTermHeaders and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetGlossaryTermHeaders("<glossaryGuid>", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetGlossaryTermHeaders with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetGlossaryTermHeaders("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+Response response = client.GetGlossaryTermHeaders("<glossaryGuid>", 1234, 1234, "<sort>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("description").ToString());
@@ -8050,18 +6629,28 @@ Console.WriteLine(result[0].GetProperty("source").ToString());
 Console.WriteLine(result[0].GetProperty("status").ToString());
 Console.WriteLine(result[0].GetProperty("steward").ToString());
 Console.WriteLine(result[0].GetProperty("termGuid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetImportCsvOperationStatusAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetImportCsvOperationStatusAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetImportCsvOperationStatusAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetImportCsvOperationStatusAsync("<operationGuid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetImportCsvOperationStatusAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetImportCsvOperationStatusAsync("<operationGuid>", new RequestContext());
+Response response = await client.GetImportCsvOperationStatusAsync("<operationGuid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -8072,18 +6661,28 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("importedTerms").
 Console.WriteLine(result.GetProperty("properties").GetProperty("totalTermsDetected").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("errorCode").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("errorMessage").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetImportCsvOperationStatus(string,RequestContext)">
-<example>
-This sample shows how to call GetImportCsvOperationStatus with required parameters and parse the result.
+      <example>
+This sample shows how to call GetImportCsvOperationStatus and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetImportCsvOperationStatus("<operationGuid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetImportCsvOperationStatus with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetImportCsvOperationStatus("<operationGuid>", new RequestContext());
+Response response = client.GetImportCsvOperationStatus("<operationGuid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -8094,86 +6693,94 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("importedTerms").
 Console.WriteLine(result.GetProperty("properties").GetProperty("totalTermsDetected").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("errorCode").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("errorMessage").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="ExportGlossaryTermsAsCsvAsync(string,RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call ExportGlossaryTermsAsCsvAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call ExportGlossaryTermsAsCsvAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new[] {
-    "<String>"
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.ExportGlossaryTermsAsCsvAsync("<glossaryGuid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<termGuids>"
+});
+Response response = await client.ExportGlossaryTermsAsCsvAsync("<glossaryGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call ExportGlossaryTermsAsCsvAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call ExportGlossaryTermsAsCsvAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new[] {
-    "<String>"
-};
-
-Response response = await client.ExportGlossaryTermsAsCsvAsync("<glossaryGuid>", RequestContent.Create(data), true);
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<termGuids>"
+});
+Response response = await client.ExportGlossaryTermsAsCsvAsync("<glossaryGuid>", content, includeTermHierarchy: true);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="ExportGlossaryTermsAsCsv(string,RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call ExportGlossaryTermsAsCsv with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call ExportGlossaryTermsAsCsv and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-var data = new[] {
-    "<String>"
-};
-
-Response response = client.ExportGlossaryTermsAsCsv("<glossaryGuid>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<termGuids>"
+});
+Response response = client.ExportGlossaryTermsAsCsv("<glossaryGuid>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call ExportGlossaryTermsAsCsv with all parameters and request content, and how to parse the result.
+This sample shows how to call ExportGlossaryTermsAsCsv with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = new[] {
-    "<String>"
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.ExportGlossaryTermsAsCsv("<glossaryGuid>", RequestContent.Create(data), true);
+RequestContent content = RequestContent.Create(new List<object>()
+{
+"<termGuids>"
+});
+Response response = client.ExportGlossaryTermsAsCsv("<glossaryGuid>", content, includeTermHierarchy: true);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTermsByGlossaryNameAsync(string,int?,int?,bool?,RequestContext)">
-<example>
-This sample shows how to call GetTermsByGlossaryNameAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTermsByGlossaryNameAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = await client.GetTermsByGlossaryNameAsync("<glossaryName>", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetTermsByGlossaryNameAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = await client.GetTermsByGlossaryNameAsync("<glossaryName>", 1234, 1234, true, new RequestContext());
+Response response = await client.GetTermsByGlossaryNameAsync("<glossaryName>", 1234, 1234, true, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("abbreviation").ToString());
@@ -8196,20 +6803,20 @@ Console.WriteLine(result[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result[0].GetProperty("status").ToString());
 Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("displayName").ToString());
 Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -8320,8 +6927,8 @@ Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("valid
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -8330,18 +6937,28 @@ Console.WriteLine(result[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result[0].GetProperty("shortDescription").ToString());
 Console.WriteLine(result[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTermsByGlossaryName(string,int?,int?,bool?,RequestContext)">
-<example>
-This sample shows how to call GetTermsByGlossaryName with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTermsByGlossaryName and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+
+Response response = client.GetTermsByGlossaryName("<glossaryName>", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetTermsByGlossaryName with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-Response response = client.GetTermsByGlossaryName("<glossaryName>", 1234, 1234, true, new RequestContext());
+Response response = client.GetTermsByGlossaryName("<glossaryName>", 1234, 1234, true, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("abbreviation").ToString());
@@ -8364,20 +6981,20 @@ Console.WriteLine(result[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result[0].GetProperty("status").ToString());
 Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("displayName").ToString());
 Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("url").ToString());
-Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
 Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("description").ToString());
 Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -8488,8 +7105,8 @@ Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("valid
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -8498,36 +7115,33 @@ Console.WriteLine(result[0].GetProperty("qualifiedName").ToString());
 Console.WriteLine(result[0].GetProperty("shortDescription").ToString());
 Console.WriteLine(result[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="ImportGlossaryTermsViaCsvAsync(WaitUntil,string,RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call ImportGlossaryTermsViaCsvAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call ImportGlossaryTermsViaCsvAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = File.OpenRead("<filePath>");
-
-var operation = await client.ImportGlossaryTermsViaCsvAsync(WaitUntil.Completed, "<glossaryGuid>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Operation<BinaryData> operation = await client.ImportGlossaryTermsViaCsvAsync(WaitUntil.Completed, "<glossaryGuid>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call ImportGlossaryTermsViaCsvAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call ImportGlossaryTermsViaCsvAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = File.OpenRead("<filePath>");
-
-var operation = await client.ImportGlossaryTermsViaCsvAsync(WaitUntil.Completed, "<glossaryGuid>", RequestContent.Create(data), true);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Operation<BinaryData> operation = await client.ImportGlossaryTermsViaCsvAsync(WaitUntil.Completed, "<glossaryGuid>", content, includeTermHierarchy: true);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -8537,36 +7151,33 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("importedTerms").
 Console.WriteLine(result.GetProperty("properties").GetProperty("totalTermsDetected").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("errorCode").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("errorMessage").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="ImportGlossaryTermsViaCsv(WaitUntil,string,RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call ImportGlossaryTermsViaCsv with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call ImportGlossaryTermsViaCsv and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = File.OpenRead("<filePath>");
-
-var operation = client.ImportGlossaryTermsViaCsv(WaitUntil.Completed, "<glossaryGuid>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Operation<BinaryData> operation = client.ImportGlossaryTermsViaCsv(WaitUntil.Completed, "<glossaryGuid>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call ImportGlossaryTermsViaCsv with all parameters and request content, and how to parse the result.
+This sample shows how to call ImportGlossaryTermsViaCsv with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = File.OpenRead("<filePath>");
-
-var operation = client.ImportGlossaryTermsViaCsv(WaitUntil.Completed, "<glossaryGuid>", RequestContent.Create(data), true);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Operation<BinaryData> operation = client.ImportGlossaryTermsViaCsv(WaitUntil.Completed, "<glossaryGuid>", content, includeTermHierarchy: true);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -8576,36 +7187,33 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("importedTerms").
 Console.WriteLine(result.GetProperty("properties").GetProperty("totalTermsDetected").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("errorCode").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("errorMessage").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="ImportGlossaryTermsViaCsvByGlossaryNameAsync(WaitUntil,string,RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call ImportGlossaryTermsViaCsvByGlossaryNameAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call ImportGlossaryTermsViaCsvByGlossaryNameAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = File.OpenRead("<filePath>");
-
-var operation = await client.ImportGlossaryTermsViaCsvByGlossaryNameAsync(WaitUntil.Completed, "<glossaryName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Operation<BinaryData> operation = await client.ImportGlossaryTermsViaCsvByGlossaryNameAsync(WaitUntil.Completed, "<glossaryName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call ImportGlossaryTermsViaCsvByGlossaryNameAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call ImportGlossaryTermsViaCsvByGlossaryNameAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = File.OpenRead("<filePath>");
-
-var operation = await client.ImportGlossaryTermsViaCsvByGlossaryNameAsync(WaitUntil.Completed, "<glossaryName>", RequestContent.Create(data), true);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Operation<BinaryData> operation = await client.ImportGlossaryTermsViaCsvByGlossaryNameAsync(WaitUntil.Completed, "<glossaryName>", content, includeTermHierarchy: true);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -8615,36 +7223,33 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("importedTerms").
 Console.WriteLine(result.GetProperty("properties").GetProperty("totalTermsDetected").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("errorCode").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("errorMessage").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="ImportGlossaryTermsViaCsvByGlossaryName(WaitUntil,string,RequestContent,bool?,RequestContext)">
-<example>
-This sample shows how to call ImportGlossaryTermsViaCsvByGlossaryName with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call ImportGlossaryTermsViaCsvByGlossaryName and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = File.OpenRead("<filePath>");
-
-var operation = client.ImportGlossaryTermsViaCsvByGlossaryName(WaitUntil.Completed, "<glossaryName>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Operation<BinaryData> operation = client.ImportGlossaryTermsViaCsvByGlossaryName(WaitUntil.Completed, "<glossaryName>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call ImportGlossaryTermsViaCsvByGlossaryName with all parameters and request content, and how to parse the result.
+This sample shows how to call ImportGlossaryTermsViaCsvByGlossaryName with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-var data = File.OpenRead("<filePath>");
-
-var operation = client.ImportGlossaryTermsViaCsvByGlossaryName(WaitUntil.Completed, "<glossaryName>", RequestContent.Create(data), true);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Operation<BinaryData> operation = client.ImportGlossaryTermsViaCsvByGlossaryName(WaitUntil.Completed, "<glossaryName>", content, includeTermHierarchy: true);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
@@ -8654,8 +7259,7 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("importedTerms").
 Console.WriteLine(result.GetProperty("properties").GetProperty("totalTermsDetected").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("errorCode").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("errorMessage").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewLineages.xml b/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewLineages.xml
index 1b4c6b57c4da..e7faec16ba08 100644
--- a/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewLineages.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewLineages.xml
@@ -2,49 +2,60 @@
 <doc>
   <members>
     <member name="GetLineageGraphAsync(string,string,int?,int?,bool?,bool?,RequestContext)">
-<example>
-This sample shows how to call GetLineageGraphAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLineageGraphAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-Response response = await client.GetLineageGraphAsync("<guid>", "<direction>", 1234, 1234, true, true, new RequestContext());
+Response response = await client.GetLineageGraphAsync("<guid>", "BOTH", null, null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetLineageGraphAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+
+Response response = await client.GetLineageGraphAsync("<guid>", "BOTH", 1234, 1234, true, true, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("baseEntityGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("lineageDepth").ToString());
 Console.WriteLine(result.GetProperty("lineageWidth").ToString());
 Console.WriteLine(result.GetProperty("includeParent").ToString());
@@ -56,53 +67,63 @@ Console.WriteLine(result.GetProperty("parentRelations")[0].GetProperty("parentEn
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("fromEntityId").ToString());
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("relationshipId").ToString());
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("toEntityId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetLineageGraph(string,string,int?,int?,bool?,bool?,RequestContext)">
-<example>
-This sample shows how to call GetLineageGraph with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLineageGraph and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+
+Response response = client.GetLineageGraph("<guid>", "BOTH", null, null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetLineageGraph with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-Response response = client.GetLineageGraph("<guid>", "<direction>", 1234, 1234, true, true, new RequestContext());
+Response response = client.GetLineageGraph("<guid>", "BOTH", 1234, 1234, true, true, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("baseEntityGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("lineageDepth").ToString());
 Console.WriteLine(result.GetProperty("lineageWidth").ToString());
 Console.WriteLine(result.GetProperty("includeParent").ToString());
@@ -114,53 +135,63 @@ Console.WriteLine(result.GetProperty("parentRelations")[0].GetProperty("parentEn
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("fromEntityId").ToString());
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("relationshipId").ToString());
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("toEntityId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="NextPageLineageAsync(string,string,bool?,int?,int?,RequestContext)">
-<example>
-This sample shows how to call NextPageLineageAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call NextPageLineageAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-Response response = await client.NextPageLineageAsync("<guid>", "<direction>", true, 1234, 1234, new RequestContext());
+Response response = await client.NextPageLineageAsync("<guid>", "BOTH", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call NextPageLineageAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+
+Response response = await client.NextPageLineageAsync("<guid>", "BOTH", true, 1234, 1234, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("baseEntityGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("lineageDepth").ToString());
 Console.WriteLine(result.GetProperty("lineageWidth").ToString());
 Console.WriteLine(result.GetProperty("includeParent").ToString());
@@ -172,53 +203,63 @@ Console.WriteLine(result.GetProperty("parentRelations")[0].GetProperty("parentEn
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("fromEntityId").ToString());
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("relationshipId").ToString());
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("toEntityId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="NextPageLineage(string,string,bool?,int?,int?,RequestContext)">
-<example>
-This sample shows how to call NextPageLineage with required parameters and parse the result.
+      <example>
+This sample shows how to call NextPageLineage and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-Response response = client.NextPageLineage("<guid>", "<direction>", true, 1234, 1234, new RequestContext());
+Response response = client.NextPageLineage("<guid>", "BOTH", null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call NextPageLineage with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+
+Response response = client.NextPageLineage("<guid>", "BOTH", true, 1234, 1234, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("baseEntityGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("lineageDepth").ToString());
 Console.WriteLine(result.GetProperty("lineageWidth").ToString());
 Console.WriteLine(result.GetProperty("includeParent").ToString());
@@ -230,53 +271,63 @@ Console.WriteLine(result.GetProperty("parentRelations")[0].GetProperty("parentEn
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("fromEntityId").ToString());
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("relationshipId").ToString());
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("toEntityId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetLineageByUniqueAttributeAsync(string,string,int?,int?,bool?,bool?,RequestContext)">
-<example>
-This sample shows how to call GetLineageByUniqueAttributeAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLineageByUniqueAttributeAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+
+Response response = await client.GetLineageByUniqueAttributeAsync("<typeName>", "BOTH", null, null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetLineageByUniqueAttributeAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-Response response = await client.GetLineageByUniqueAttributeAsync("<typeName>", "<direction>", 1234, 1234, true, true, new RequestContext());
+Response response = await client.GetLineageByUniqueAttributeAsync("<typeName>", "BOTH", 1234, 1234, true, true, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("baseEntityGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("lineageDepth").ToString());
 Console.WriteLine(result.GetProperty("lineageWidth").ToString());
 Console.WriteLine(result.GetProperty("includeParent").ToString());
@@ -288,53 +339,63 @@ Console.WriteLine(result.GetProperty("parentRelations")[0].GetProperty("parentEn
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("fromEntityId").ToString());
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("relationshipId").ToString());
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("toEntityId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetLineageByUniqueAttribute(string,string,int?,int?,bool?,bool?,RequestContext)">
-<example>
-This sample shows how to call GetLineageByUniqueAttribute with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLineageByUniqueAttribute and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-Response response = client.GetLineageByUniqueAttribute("<typeName>", "<direction>", 1234, 1234, true, true, new RequestContext());
+Response response = client.GetLineageByUniqueAttribute("<typeName>", "BOTH", null, null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetLineageByUniqueAttribute with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+
+Response response = client.GetLineageByUniqueAttribute("<typeName>", "BOTH", 1234, 1234, true, true, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("baseEntityGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<test>").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<key>").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("lineageDepth").ToString());
 Console.WriteLine(result.GetProperty("lineageWidth").ToString());
 Console.WriteLine(result.GetProperty("includeParent").ToString());
@@ -346,8 +407,7 @@ Console.WriteLine(result.GetProperty("parentRelations")[0].GetProperty("parentEn
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("fromEntityId").ToString());
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("relationshipId").ToString());
 Console.WriteLine(result.GetProperty("relations")[0].GetProperty("toEntityId").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewRelationships.xml b/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewRelationships.xml
index 87eb635d0750..20430fdd0c4a 100644
--- a/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewRelationships.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewRelationships.xml
@@ -2,121 +2,66 @@
 <doc>
   <members>
     <member name="CreateAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-var data = new {};
-
-Response response = await client.CreateAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateAsync with all request content, and how to parse the result.
+This sample shows how to call CreateAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-var data = new {
-    createTime = 123.45f,
-    createdBy = "<createdBy>",
-    end1 = new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["createTime"] = 123.45F,
+    ["createdBy"] = "<createdBy>",
+    ["end1"] = new Dictionary<string, object>()
+    {
+        ["guid"] = "<guid>",
+        ["typeName"] = "<typeName>",
+        ["uniqueAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
     },
-    end2 = new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
+    ["end2"] = null
+,
+    ["guid"] = "<guid>",
+    ["homeId"] = "<homeId>",
+    ["label"] = "<label>",
+    ["provenanceType"] = 123.45F,
+    ["status"] = "ACTIVE",
+    ["updateTime"] = 123.45F,
+    ["updatedBy"] = "<updatedBy>",
+    ["version"] = 123.45F,
+    ["attributes"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-    guid = "<guid>",
-    homeId = "<homeId>",
-    label = "<label>",
-    provenanceType = 123.45f,
-    status = "ACTIVE",
-    updateTime = 123.45f,
-    updatedBy = "<updatedBy>",
-    version = 123.45f,
-    attributes = new {
-        key = new {},
-    },
-    typeName = "<typeName>",
-    lastModifiedTS = "<lastModifiedTS>",
-};
-
-Response response = await client.CreateAsync(RequestContent.Create(data));
+    ["typeName"] = "<typeName>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+});
+Response response = await client.CreateAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("end1").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("end1").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("end2").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("end2").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("homeId").ToString());
 Console.WriteLine(result.GetProperty("label").ToString());
@@ -125,128 +70,72 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="Create(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call Create and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-var data = new {};
-
-Response response = client.Create(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.Create(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call Create with all request content, and how to parse the result.
+This sample shows how to call Create with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-var data = new {
-    createTime = 123.45f,
-    createdBy = "<createdBy>",
-    end1 = new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    },
-    end2 = new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["createTime"] = 123.45F,
+    ["createdBy"] = "<createdBy>",
+    ["end1"] = new Dictionary<string, object>()
+    {
+        ["guid"] = "<guid>",
+        ["typeName"] = "<typeName>",
+        ["uniqueAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
     },
-    guid = "<guid>",
-    homeId = "<homeId>",
-    label = "<label>",
-    provenanceType = 123.45f,
-    status = "ACTIVE",
-    updateTime = 123.45f,
-    updatedBy = "<updatedBy>",
-    version = 123.45f,
-    attributes = new {
-        key = new {},
+    ["end2"] = null
+,
+    ["guid"] = "<guid>",
+    ["homeId"] = "<homeId>",
+    ["label"] = "<label>",
+    ["provenanceType"] = 123.45F,
+    ["status"] = "ACTIVE",
+    ["updateTime"] = 123.45F,
+    ["updatedBy"] = "<updatedBy>",
+    ["version"] = 123.45F,
+    ["attributes"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-    typeName = "<typeName>",
-    lastModifiedTS = "<lastModifiedTS>",
-};
-
-Response response = client.Create(RequestContent.Create(data));
+    ["typeName"] = "<typeName>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+});
+Response response = client.Create(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("end1").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("end1").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("end2").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("end2").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("homeId").ToString());
 Console.WriteLine(result.GetProperty("label").ToString());
@@ -255,128 +144,72 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call UpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-Response response = await client.UpdateAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.UpdateAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateAsync with all request content, and how to parse the result.
+This sample shows how to call UpdateAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-var data = new {
-    createTime = 123.45f,
-    createdBy = "<createdBy>",
-    end1 = new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    },
-    end2 = new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["createTime"] = 123.45F,
+    ["createdBy"] = "<createdBy>",
+    ["end1"] = new Dictionary<string, object>()
+    {
+        ["guid"] = "<guid>",
+        ["typeName"] = "<typeName>",
+        ["uniqueAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
     },
-    guid = "<guid>",
-    homeId = "<homeId>",
-    label = "<label>",
-    provenanceType = 123.45f,
-    status = "ACTIVE",
-    updateTime = 123.45f,
-    updatedBy = "<updatedBy>",
-    version = 123.45f,
-    attributes = new {
-        key = new {},
+    ["end2"] = null
+,
+    ["guid"] = "<guid>",
+    ["homeId"] = "<homeId>",
+    ["label"] = "<label>",
+    ["provenanceType"] = 123.45F,
+    ["status"] = "ACTIVE",
+    ["updateTime"] = 123.45F,
+    ["updatedBy"] = "<updatedBy>",
+    ["version"] = 123.45F,
+    ["attributes"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-    typeName = "<typeName>",
-    lastModifiedTS = "<lastModifiedTS>",
-};
-
-Response response = await client.UpdateAsync(RequestContent.Create(data));
+    ["typeName"] = "<typeName>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+});
+Response response = await client.UpdateAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("end1").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("end1").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("end2").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("end2").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("homeId").ToString());
 Console.WriteLine(result.GetProperty("label").ToString());
@@ -385,128 +218,72 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="Update(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call Update and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-Response response = client.Update(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.Update(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call Update with all request content, and how to parse the result.
+This sample shows how to call Update with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-var data = new {
-    createTime = 123.45f,
-    createdBy = "<createdBy>",
-    end1 = new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    },
-    end2 = new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["createTime"] = 123.45F,
+    ["createdBy"] = "<createdBy>",
+    ["end1"] = new Dictionary<string, object>()
+    {
+        ["guid"] = "<guid>",
+        ["typeName"] = "<typeName>",
+        ["uniqueAttributes"] = new Dictionary<string, object>()
+        {
+            ["key"] = new Dictionary<string, object>(),
         },
     },
-    guid = "<guid>",
-    homeId = "<homeId>",
-    label = "<label>",
-    provenanceType = 123.45f,
-    status = "ACTIVE",
-    updateTime = 123.45f,
-    updatedBy = "<updatedBy>",
-    version = 123.45f,
-    attributes = new {
-        key = new {},
+    ["end2"] = null
+,
+    ["guid"] = "<guid>",
+    ["homeId"] = "<homeId>",
+    ["label"] = "<label>",
+    ["provenanceType"] = 123.45F,
+    ["status"] = "ACTIVE",
+    ["updateTime"] = 123.45F,
+    ["updatedBy"] = "<updatedBy>",
+    ["version"] = 123.45F,
+    ["attributes"] = new Dictionary<string, object>()
+    {
+        ["key"] = new Dictionary<string, object>(),
     },
-    typeName = "<typeName>",
-    lastModifiedTS = "<lastModifiedTS>",
-};
-
-Response response = client.Update(RequestContent.Create(data));
+    ["typeName"] = "<typeName>",
+    ["lastModifiedTS"] = "<lastModifiedTS>",
+});
+Response response = client.Update(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("createTime").ToString());
 Console.WriteLine(result.GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("end1").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("end1").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("end2").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("end2").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("homeId").ToString());
 Console.WriteLine(result.GetProperty("label").ToString());
@@ -515,62 +292,72 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetPurviewRelationshipAsync(string,bool?,RequestContext)">
-<example>
-This sample shows how to call GetPurviewRelationshipAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPurviewRelationshipAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-Response response = await client.GetPurviewRelationshipAsync("<guid>", true, new RequestContext());
+Response response = await client.GetPurviewRelationshipAsync("<guid>", null, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPurviewRelationshipAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+
+Response response = await client.GetPurviewRelationshipAsync("<guid>", true, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("createTime").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("homeId").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("label").ToString());
@@ -579,62 +366,72 @@ Console.WriteLine(result.GetProperty("relationship").GetProperty("status").ToStr
 Console.WriteLine(result.GetProperty("relationship").GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("relationship").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationship").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetPurviewRelationship(string,bool?,RequestContext)">
-<example>
-This sample shows how to call GetPurviewRelationship with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPurviewRelationship and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-Response response = client.GetPurviewRelationship("<guid>", true, new RequestContext());
+Response response = client.GetPurviewRelationship("<guid>", null, null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPurviewRelationship with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+
+Response response = client.GetPurviewRelationship("<guid>", true, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("createTime").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("createdBy").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("typeName").ToString());
-Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("homeId").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("label").ToString());
@@ -643,37 +440,52 @@ Console.WriteLine(result.GetProperty("relationship").GetProperty("status").ToStr
 Console.WriteLine(result.GetProperty("relationship").GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("version").ToString());
-Console.WriteLine(result.GetProperty("relationship").GetProperty("attributes").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationship").GetProperty("attributes").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("relationship").GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters.
+      <example>
+This sample shows how to call DeleteAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
 Response response = await client.DeleteAsync("<guid>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+
+Response response = await client.DeleteAsync("<guid>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="Delete(string,RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters.
+      <example>
+This sample shows how to call Delete.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
 Response response = client.Delete("<guid>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call Delete with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+
+Response response = client.Delete("<guid>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewTypes.xml b/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewTypes.xml
index b6068bd89646..7840a4f888d9 100644
--- a/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewTypes.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Catalog/src/Generated/Docs/PurviewTypes.xml
@@ -2,18 +2,29 @@
 <doc>
   <members>
     <member name="GetBusinessMetadataDefByGuidAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetBusinessMetadataDefByGuidAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBusinessMetadataDefByGuidAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetBusinessMetadataDefByGuidAsync("<guid>", new RequestContext());
+Response response = await client.GetBusinessMetadataDefByGuidAsync("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetBusinessMetadataDefByGuidAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetBusinessMetadataDefByGuidAsync("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -22,7 +33,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -49,29 +60,39 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetBusinessMetadataDefByGuid(string,RequestContext)">
-<example>
-This sample shows how to call GetBusinessMetadataDefByGuid with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBusinessMetadataDefByGuid and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetBusinessMetadataDefByGuid("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetBusinessMetadataDefByGuid with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetBusinessMetadataDefByGuid("<guid>", new RequestContext());
+Response response = client.GetBusinessMetadataDefByGuid("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -80,7 +101,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -107,29 +128,39 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetBusinessMetadataDefByNameAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetBusinessMetadataDefByNameAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBusinessMetadataDefByNameAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetBusinessMetadataDefByNameAsync("<name>", new RequestContext());
+Response response = await client.GetBusinessMetadataDefByNameAsync("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetBusinessMetadataDefByNameAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetBusinessMetadataDefByNameAsync("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -138,7 +169,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -165,29 +196,39 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetBusinessMetadataDefByName(string,RequestContext)">
-<example>
-This sample shows how to call GetBusinessMetadataDefByName with required parameters and parse the result.
+      <example>
+This sample shows how to call GetBusinessMetadataDefByName and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetBusinessMetadataDefByName("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetBusinessMetadataDefByName with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetBusinessMetadataDefByName("<name>", new RequestContext());
+Response response = client.GetBusinessMetadataDefByName("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -196,7 +237,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -223,32 +264,42 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetClassificationDefByGuidAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetClassificationDefByGuidAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetClassificationDefByGuidAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetClassificationDefByGuidAsync("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetClassificationDefByGuidAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetClassificationDefByGuidAsync("<guid>", new RequestContext());
+Response response = await client.GetClassificationDefByGuidAsync("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("entityTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("superTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -257,7 +308,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -284,32 +335,42 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetClassificationDefByGuid(string,RequestContext)">
-<example>
-This sample shows how to call GetClassificationDefByGuid with required parameters and parse the result.
+      <example>
+This sample shows how to call GetClassificationDefByGuid and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetClassificationDefByGuid("<guid>", new RequestContext());
+Response response = client.GetClassificationDefByGuid("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetClassificationDefByGuid with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetClassificationDefByGuid("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("entityTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("superTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -318,7 +379,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -345,32 +406,42 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetClassificationDefByNameAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetClassificationDefByNameAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetClassificationDefByNameAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetClassificationDefByNameAsync("<name>", new RequestContext());
+Response response = await client.GetClassificationDefByNameAsync("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetClassificationDefByNameAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetClassificationDefByNameAsync("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("entityTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("superTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -379,7 +450,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -406,32 +477,42 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetClassificationDefByName(string,RequestContext)">
-<example>
-This sample shows how to call GetClassificationDefByName with required parameters and parse the result.
+      <example>
+This sample shows how to call GetClassificationDefByName and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetClassificationDefByName("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetClassificationDefByName with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetClassificationDefByName("<name>", new RequestContext());
+Response response = client.GetClassificationDefByName("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("entityTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("superTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -440,7 +521,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -467,25 +548,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetEntityDefinitionByGuidAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetEntityDefinitionByGuidAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEntityDefinitionByGuidAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetEntityDefinitionByGuidAsync("<guid>", new RequestContext());
+Response response = await client.GetEntityDefinitionByGuidAsync("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetEntityDefinitionByGuidAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetEntityDefinitionByGuidAsync("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
@@ -493,7 +584,7 @@ Console.WriteLine(result.GetProperty("superTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -502,12 +593,12 @@ Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -516,7 +607,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -543,25 +634,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetEntityDefinitionByGuid(string,RequestContext)">
-<example>
-This sample shows how to call GetEntityDefinitionByGuid with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEntityDefinitionByGuid and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetEntityDefinitionByGuid("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetEntityDefinitionByGuid with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetEntityDefinitionByGuid("<guid>", new RequestContext());
+Response response = client.GetEntityDefinitionByGuid("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
@@ -569,7 +670,7 @@ Console.WriteLine(result.GetProperty("superTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -578,12 +679,12 @@ Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -592,7 +693,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -619,25 +720,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetEntityDefinitionByNameAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetEntityDefinitionByNameAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEntityDefinitionByNameAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetEntityDefinitionByNameAsync("<name>", new RequestContext());
+Response response = await client.GetEntityDefinitionByNameAsync("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetEntityDefinitionByNameAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetEntityDefinitionByNameAsync("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
@@ -645,7 +756,7 @@ Console.WriteLine(result.GetProperty("superTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -654,12 +765,12 @@ Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -668,7 +779,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -695,25 +806,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetEntityDefinitionByName(string,RequestContext)">
-<example>
-This sample shows how to call GetEntityDefinitionByName with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEntityDefinitionByName and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetEntityDefinitionByName("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetEntityDefinitionByName with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetEntityDefinitionByName("<name>", new RequestContext());
+Response response = client.GetEntityDefinitionByName("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
@@ -721,7 +842,7 @@ Console.WriteLine(result.GetProperty("superTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -730,12 +851,12 @@ Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -744,7 +865,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -771,25 +892,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetEnumDefByGuidAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetEnumDefByGuidAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEnumDefByGuidAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetEnumDefByGuidAsync("<guid>", new RequestContext());
+Response response = await client.GetEnumDefByGuidAsync("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetEnumDefByGuidAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetEnumDefByGuidAsync("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("defaultValue").ToString());
@@ -819,25 +950,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetEnumDefByGuid(string,RequestContext)">
-<example>
-This sample shows how to call GetEnumDefByGuid with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEnumDefByGuid and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetEnumDefByGuid("<guid>", new RequestContext());
+Response response = client.GetEnumDefByGuid("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetEnumDefByGuid with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetEnumDefByGuid("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("defaultValue").ToString());
@@ -867,25 +1008,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetEnumDefByNameAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetEnumDefByNameAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEnumDefByNameAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetEnumDefByNameAsync("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetEnumDefByNameAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetEnumDefByNameAsync("<name>", new RequestContext());
+Response response = await client.GetEnumDefByNameAsync("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("defaultValue").ToString());
@@ -915,25 +1066,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetEnumDefByName(string,RequestContext)">
-<example>
-This sample shows how to call GetEnumDefByName with required parameters and parse the result.
+      <example>
+This sample shows how to call GetEnumDefByName and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetEnumDefByName("<name>", new RequestContext());
+Response response = client.GetEnumDefByName("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetEnumDefByName with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetEnumDefByName("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("defaultValue").ToString());
@@ -963,25 +1124,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRelationshipDefByGuidAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetRelationshipDefByGuidAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRelationshipDefByGuidAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetRelationshipDefByGuidAsync("<guid>", new RequestContext());
+Response response = await client.GetRelationshipDefByGuidAsync("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetRelationshipDefByGuidAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetRelationshipDefByGuidAsync("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("endDef1").GetProperty("cardinality").ToString());
@@ -999,7 +1170,7 @@ Console.WriteLine(result.GetProperty("endDef2").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("relationshipCategory").ToString());
 Console.WriteLine(result.GetProperty("relationshipLabel").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1008,7 +1179,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1035,25 +1206,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRelationshipDefByGuid(string,RequestContext)">
-<example>
-This sample shows how to call GetRelationshipDefByGuid with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRelationshipDefByGuid and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetRelationshipDefByGuid("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetRelationshipDefByGuid with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetRelationshipDefByGuid("<guid>", new RequestContext());
+Response response = client.GetRelationshipDefByGuid("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("endDef1").GetProperty("cardinality").ToString());
@@ -1071,7 +1252,7 @@ Console.WriteLine(result.GetProperty("endDef2").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("relationshipCategory").ToString());
 Console.WriteLine(result.GetProperty("relationshipLabel").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1080,7 +1261,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1107,25 +1288,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRelationshipDefByNameAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetRelationshipDefByNameAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRelationshipDefByNameAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetRelationshipDefByNameAsync("<name>", new RequestContext());
+Response response = await client.GetRelationshipDefByNameAsync("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetRelationshipDefByNameAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetRelationshipDefByNameAsync("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("endDef1").GetProperty("cardinality").ToString());
@@ -1143,7 +1334,7 @@ Console.WriteLine(result.GetProperty("endDef2").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("relationshipCategory").ToString());
 Console.WriteLine(result.GetProperty("relationshipLabel").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1152,7 +1343,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1179,25 +1370,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRelationshipDefByName(string,RequestContext)">
-<example>
-This sample shows how to call GetRelationshipDefByName with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRelationshipDefByName and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetRelationshipDefByName("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetRelationshipDefByName with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetRelationshipDefByName("<name>", new RequestContext());
+Response response = client.GetRelationshipDefByName("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("endDef1").GetProperty("cardinality").ToString());
@@ -1215,7 +1416,7 @@ Console.WriteLine(result.GetProperty("endDef2").GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("relationshipCategory").ToString());
 Console.WriteLine(result.GetProperty("relationshipLabel").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1224,7 +1425,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1251,29 +1452,39 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetStructDefByGuidAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetStructDefByGuidAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetStructDefByGuidAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetStructDefByGuidAsync("<guid>", new RequestContext());
+Response response = await client.GetStructDefByGuidAsync("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetStructDefByGuidAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetStructDefByGuidAsync("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1282,7 +1493,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1309,29 +1520,39 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetStructDefByGuid(string,RequestContext)">
-<example>
-This sample shows how to call GetStructDefByGuid with required parameters and parse the result.
+      <example>
+This sample shows how to call GetStructDefByGuid and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetStructDefByGuid("<guid>", new RequestContext());
+Response response = client.GetStructDefByGuid("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetStructDefByGuid with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetStructDefByGuid("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1340,7 +1561,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1367,29 +1588,39 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetStructDefByNameAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetStructDefByNameAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetStructDefByNameAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetStructDefByNameAsync("<name>", new RequestContext());
+Response response = await client.GetStructDefByNameAsync("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetStructDefByNameAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetStructDefByNameAsync("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1398,7 +1629,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1425,29 +1656,39 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetStructDefByName(string,RequestContext)">
-<example>
-This sample shows how to call GetStructDefByName with required parameters and parse the result.
+      <example>
+This sample shows how to call GetStructDefByName and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetStructDefByName("<name>", new RequestContext());
+Response response = client.GetStructDefByName("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetStructDefByName with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetStructDefByName("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1456,7 +1697,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1483,25 +1724,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTypeDefinitionByGuidAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetTypeDefinitionByGuidAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTypeDefinitionByGuidAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetTypeDefinitionByGuidAsync("<guid>", new RequestContext());
+Response response = await client.GetTypeDefinitionByGuidAsync("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTypeDefinitionByGuidAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetTypeDefinitionByGuidAsync("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("category").ToString());
@@ -1527,25 +1778,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTypeDefinitionByGuid(string,RequestContext)">
-<example>
-This sample shows how to call GetTypeDefinitionByGuid with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTypeDefinitionByGuid and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetTypeDefinitionByGuid("<guid>", new RequestContext());
+Response response = client.GetTypeDefinitionByGuid("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTypeDefinitionByGuid with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetTypeDefinitionByGuid("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("category").ToString());
@@ -1571,25 +1832,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTypeDefinitionByNameAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetTypeDefinitionByNameAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTypeDefinitionByNameAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetTypeDefinitionByNameAsync("<name>", new RequestContext());
+Response response = await client.GetTypeDefinitionByNameAsync("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTypeDefinitionByNameAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetTypeDefinitionByNameAsync("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("category").ToString());
@@ -1615,25 +1886,35 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTypeDefinitionByName(string,RequestContext)">
-<example>
-This sample shows how to call GetTypeDefinitionByName with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTypeDefinitionByName and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetTypeDefinitionByName("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTypeDefinitionByName with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetTypeDefinitionByName("<name>", new RequestContext());
+Response response = client.GetTypeDefinitionByName("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("category").ToString());
@@ -1659,55 +1940,81 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteTypeByNameAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteTypeByNameAsync with required parameters.
+      <example>
+This sample shows how to call DeleteTypeByNameAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
 Response response = await client.DeleteTypeByNameAsync("<name>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteTypeByNameAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.DeleteTypeByNameAsync("<name>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteTypeByName(string,RequestContext)">
-<example>
-This sample shows how to call DeleteTypeByName with required parameters.
+      <example>
+This sample shows how to call DeleteTypeByName.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
 Response response = client.DeleteTypeByName("<name>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteTypeByName with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.DeleteTypeByName("<name>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetAllTypeDefinitionsAsync(bool?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllTypeDefinitionsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllTypeDefinitionsAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetAllTypeDefinitionsAsync(null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetAllTypeDefinitionsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetAllTypeDefinitionsAsync(true, "<type>", new RequestContext());
+Response response = await client.GetAllTypeDefinitionsAsync(true, "enum", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1716,7 +2023,7 @@ Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("att
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1743,7 +2050,7 @@ Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("dat
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("updateTime").ToString());
@@ -1754,7 +2061,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("entit
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("subTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("superTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1763,7 +2070,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attri
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1790,7 +2097,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("dateF
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("updateTime").ToString());
@@ -1802,7 +2109,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("superTypes")[
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -1811,12 +2118,12 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipA
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1825,7 +2132,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1852,7 +2159,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("dateFormatter
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("updateTime").ToString());
@@ -1886,7 +2193,7 @@ Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("dateFormatter")
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("updateTime").ToString());
@@ -1908,7 +2215,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("endDef2
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipCategory").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipLabel").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1917,7 +2224,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attribu
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1944,7 +2251,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("dateFor
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updateTime").ToString());
@@ -1952,7 +2259,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updated
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1961,7 +2268,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1988,7 +2295,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("dateFormatter
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updateTime").ToString());
@@ -1996,7 +2303,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updatedBy").T
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2005,7 +2312,7 @@ Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attribu
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2032,29 +2339,39 @@ Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("dateFor
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAllTypeDefinitions(bool?,string,RequestContext)">
-<example>
-This sample shows how to call GetAllTypeDefinitions with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllTypeDefinitions and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetAllTypeDefinitions(null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetAllTypeDefinitions with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetAllTypeDefinitions(true, "<type>", new RequestContext());
+Response response = client.GetAllTypeDefinitions(true, "enum", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2063,7 +2380,7 @@ Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("att
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2090,7 +2407,7 @@ Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("dat
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("updateTime").ToString());
@@ -2101,7 +2418,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("entit
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("subTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("superTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2110,7 +2427,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attri
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2137,7 +2454,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("dateF
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("updateTime").ToString());
@@ -2149,7 +2466,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("superTypes")[
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -2158,12 +2475,12 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipA
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2172,7 +2489,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2199,7 +2516,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("dateFormatter
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("updateTime").ToString());
@@ -2233,7 +2550,7 @@ Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("dateFormatter")
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("updateTime").ToString());
@@ -2255,7 +2572,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("endDef2
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipCategory").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipLabel").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2264,7 +2581,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attribu
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2291,7 +2608,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("dateFor
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updateTime").ToString());
@@ -2299,7 +2616,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updated
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2308,7 +2625,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2335,7 +2652,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("dateFormatter
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updateTime").ToString());
@@ -2343,7 +2660,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updatedBy").T
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2352,7 +2669,7 @@ Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attribu
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2379,618 +2696,386 @@ Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("dateFor
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateTypeDefinitionsAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateTypeDefinitionsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.CreateTypeDefinitionsAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateTypeDefinitionsAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateTypeDefinitionsAsync with all request content, and how to parse the result.
+This sample shows how to call CreateTypeDefinitionsAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
-
-var data = new {
-    businessMetadataDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    classificationDefs = new[] {
-        new {
-            entityTypes = new[] {
-                "<String>"
-            },
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    entityDefs = new[] {
-        new {
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            relationshipAttributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    enumDefs = new[] {
-        new {
-            defaultValue = "<defaultValue>",
-            elementDefs = new[] {
-                new {
-                    description = "<description>",
-                    ordinal = 123.45f,
-                    value = "<value>",
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    relationshipDefs = new[] {
-        new {
-            endDef1 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            endDef2 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            relationshipCategory = "ASSOCIATION",
-            relationshipLabel = "<relationshipLabel>",
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    structDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    termTemplateDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-};
-
-Response response = await client.CreateTypeDefinitionsAsync(RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["businessMetadataDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["params"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["type"] = "<type>",
+}
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["calendar"] = 123.45F,
+["dateInstance"] = null
+,
+["dateTimeInstance"] = null
+,
+["instance"] = null
+,
+["lenient"] = true,
+["numberFormat"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["currency"] = "<currency>",
+["currencyInstance"] = null
+,
+["groupingUsed"] = true,
+["instance"] = null
+,
+["integerInstance"] = null
+,
+["maximumFractionDigits"] = 1234,
+["maximumIntegerDigits"] = 1234,
+["minimumFractionDigits"] = 1234,
+["minimumIntegerDigits"] = 1234,
+["numberInstance"] = null
+,
+["parseIntegerOnly"] = true,
+["percentInstance"] = null
+,
+["roundingMode"] = "UP",
+},
+["timeInstance"] = null
+,
+["timeZone"] = new Dictionary<string, object>()
+{
+["dstSavings"] = 1234,
+["id"] = "<id>",
+["availableIds"] = new List<object>()
+{
+"<availableIds>"
+},
+["default"] = null
+,
+["displayName"] = "<displayName>",
+["rawOffset"] = 1234,
+},
+},
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["classificationDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["entityDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["relationshipAttributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["isLegacyAttribute"] = true,
+["relationshipTypeName"] = "<relationshipTypeName>",
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+null
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["enumDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["defaultValue"] = "<defaultValue>",
+["elementDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["ordinal"] = 123.45F,
+["value"] = "<value>",
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["relationshipDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endDef1"] = new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["description"] = "<description>",
+["isContainer"] = true,
+["isLegacyAttribute"] = true,
+["name"] = "<name>",
+["type"] = "<type>",
+},
+["endDef2"] = null
+,
+["relationshipCategory"] = "ASSOCIATION",
+["relationshipLabel"] = "<relationshipLabel>",
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["structDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["termTemplateDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+});
+Response response = await client.CreateTypeDefinitionsAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2999,7 +3084,7 @@ Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("att
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -3026,7 +3111,7 @@ Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("dat
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("updateTime").ToString());
@@ -3037,7 +3122,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("entit
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("subTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("superTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -3046,7 +3131,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attri
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -3073,7 +3158,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("dateF
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("updateTime").ToString());
@@ -3085,7 +3170,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("superTypes")[
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -3094,12 +3179,12 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipA
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -3108,7 +3193,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -3135,7 +3220,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("dateFormatter
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("updateTime").ToString());
@@ -3169,7 +3254,7 @@ Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("dateFormatter")
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("updateTime").ToString());
@@ -3191,7 +3276,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("endDef2
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipCategory").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipLabel").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -3200,7 +3285,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attribu
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -3227,7 +3312,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("dateFor
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updateTime").ToString());
@@ -3235,7 +3320,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updated
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -3244,7 +3329,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -3271,7 +3356,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("dateFormatter
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updateTime").ToString());
@@ -3279,7 +3364,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updatedBy").T
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -3288,7 +3373,7 @@ Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attribu
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -3315,618 +3400,386 @@ Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("dateFor
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateTypeDefinitions(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateTypeDefinitions and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-var data = new {};
-
-Response response = client.CreateTypeDefinitions(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateTypeDefinitions(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateTypeDefinitions with all request content, and how to parse the result.
+This sample shows how to call CreateTypeDefinitions with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
-
-var data = new {
-    businessMetadataDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    classificationDefs = new[] {
-        new {
-            entityTypes = new[] {
-                "<String>"
-            },
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    entityDefs = new[] {
-        new {
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            relationshipAttributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    enumDefs = new[] {
-        new {
-            defaultValue = "<defaultValue>",
-            elementDefs = new[] {
-                new {
-                    description = "<description>",
-                    ordinal = 123.45f,
-                    value = "<value>",
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    relationshipDefs = new[] {
-        new {
-            endDef1 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            endDef2 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            relationshipCategory = "ASSOCIATION",
-            relationshipLabel = "<relationshipLabel>",
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    structDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    termTemplateDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-};
-
-Response response = client.CreateTypeDefinitions(RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["businessMetadataDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["params"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["type"] = "<type>",
+}
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["calendar"] = 123.45F,
+["dateInstance"] = null
+,
+["dateTimeInstance"] = null
+,
+["instance"] = null
+,
+["lenient"] = true,
+["numberFormat"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["currency"] = "<currency>",
+["currencyInstance"] = null
+,
+["groupingUsed"] = true,
+["instance"] = null
+,
+["integerInstance"] = null
+,
+["maximumFractionDigits"] = 1234,
+["maximumIntegerDigits"] = 1234,
+["minimumFractionDigits"] = 1234,
+["minimumIntegerDigits"] = 1234,
+["numberInstance"] = null
+,
+["parseIntegerOnly"] = true,
+["percentInstance"] = null
+,
+["roundingMode"] = "UP",
+},
+["timeInstance"] = null
+,
+["timeZone"] = new Dictionary<string, object>()
+{
+["dstSavings"] = 1234,
+["id"] = "<id>",
+["availableIds"] = new List<object>()
+{
+"<availableIds>"
+},
+["default"] = null
+,
+["displayName"] = "<displayName>",
+["rawOffset"] = 1234,
+},
+},
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["classificationDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["entityDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["relationshipAttributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["isLegacyAttribute"] = true,
+["relationshipTypeName"] = "<relationshipTypeName>",
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+null
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["enumDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["defaultValue"] = "<defaultValue>",
+["elementDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["ordinal"] = 123.45F,
+["value"] = "<value>",
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["relationshipDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endDef1"] = new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["description"] = "<description>",
+["isContainer"] = true,
+["isLegacyAttribute"] = true,
+["name"] = "<name>",
+["type"] = "<type>",
+},
+["endDef2"] = null
+,
+["relationshipCategory"] = "ASSOCIATION",
+["relationshipLabel"] = "<relationshipLabel>",
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["structDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["termTemplateDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+});
+Response response = client.CreateTypeDefinitions(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -3935,7 +3788,7 @@ Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("att
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -3962,7 +3815,7 @@ Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("dat
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("updateTime").ToString());
@@ -3973,7 +3826,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("entit
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("subTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("superTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -3982,7 +3835,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attri
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -4009,7 +3862,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("dateF
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("updateTime").ToString());
@@ -4021,7 +3874,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("superTypes")[
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -4030,12 +3883,12 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipA
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -4044,7 +3897,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -4071,7 +3924,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("dateFormatter
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("updateTime").ToString());
@@ -4105,7 +3958,7 @@ Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("dateFormatter")
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("updateTime").ToString());
@@ -4127,7 +3980,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("endDef2
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipCategory").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipLabel").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -4136,7 +3989,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attribu
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -4163,7 +4016,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("dateFor
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updateTime").ToString());
@@ -4171,7 +4024,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updated
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -4180,7 +4033,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -4207,7 +4060,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("dateFormatter
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updateTime").ToString());
@@ -4215,7 +4068,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updatedBy").T
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -4224,7 +4077,7 @@ Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attribu
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -4251,618 +4104,386 @@ Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("dateFor
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateAtlasTypeDefinitionsAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call UpdateAtlasTypeDefinitionsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.UpdateAtlasTypeDefinitionsAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.UpdateAtlasTypeDefinitionsAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateAtlasTypeDefinitionsAsync with all request content, and how to parse the result.
+This sample shows how to call UpdateAtlasTypeDefinitionsAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
-
-var data = new {
-    businessMetadataDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    classificationDefs = new[] {
-        new {
-            entityTypes = new[] {
-                "<String>"
-            },
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    entityDefs = new[] {
-        new {
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            relationshipAttributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    enumDefs = new[] {
-        new {
-            defaultValue = "<defaultValue>",
-            elementDefs = new[] {
-                new {
-                    description = "<description>",
-                    ordinal = 123.45f,
-                    value = "<value>",
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    relationshipDefs = new[] {
-        new {
-            endDef1 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            endDef2 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            relationshipCategory = "ASSOCIATION",
-            relationshipLabel = "<relationshipLabel>",
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    structDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    termTemplateDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-};
-
-Response response = await client.UpdateAtlasTypeDefinitionsAsync(RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["businessMetadataDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["params"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["type"] = "<type>",
+}
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["calendar"] = 123.45F,
+["dateInstance"] = null
+,
+["dateTimeInstance"] = null
+,
+["instance"] = null
+,
+["lenient"] = true,
+["numberFormat"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["currency"] = "<currency>",
+["currencyInstance"] = null
+,
+["groupingUsed"] = true,
+["instance"] = null
+,
+["integerInstance"] = null
+,
+["maximumFractionDigits"] = 1234,
+["maximumIntegerDigits"] = 1234,
+["minimumFractionDigits"] = 1234,
+["minimumIntegerDigits"] = 1234,
+["numberInstance"] = null
+,
+["parseIntegerOnly"] = true,
+["percentInstance"] = null
+,
+["roundingMode"] = "UP",
+},
+["timeInstance"] = null
+,
+["timeZone"] = new Dictionary<string, object>()
+{
+["dstSavings"] = 1234,
+["id"] = "<id>",
+["availableIds"] = new List<object>()
+{
+"<availableIds>"
+},
+["default"] = null
+,
+["displayName"] = "<displayName>",
+["rawOffset"] = 1234,
+},
+},
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["classificationDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["entityDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["relationshipAttributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["isLegacyAttribute"] = true,
+["relationshipTypeName"] = "<relationshipTypeName>",
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+null
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["enumDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["defaultValue"] = "<defaultValue>",
+["elementDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["ordinal"] = 123.45F,
+["value"] = "<value>",
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["relationshipDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endDef1"] = new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["description"] = "<description>",
+["isContainer"] = true,
+["isLegacyAttribute"] = true,
+["name"] = "<name>",
+["type"] = "<type>",
+},
+["endDef2"] = null
+,
+["relationshipCategory"] = "ASSOCIATION",
+["relationshipLabel"] = "<relationshipLabel>",
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["structDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["termTemplateDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+});
+Response response = await client.UpdateAtlasTypeDefinitionsAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -4871,7 +4492,7 @@ Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("att
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -4898,7 +4519,7 @@ Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("dat
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("updateTime").ToString());
@@ -4909,7 +4530,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("entit
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("subTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("superTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -4918,7 +4539,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attri
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -4945,7 +4566,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("dateF
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("updateTime").ToString());
@@ -4957,7 +4578,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("superTypes")[
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -4966,12 +4587,12 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipA
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -4980,7 +4601,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -5007,7 +4628,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("dateFormatter
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("updateTime").ToString());
@@ -5041,7 +4662,7 @@ Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("dateFormatter")
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("updateTime").ToString());
@@ -5063,7 +4684,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("endDef2
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipCategory").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipLabel").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -5072,7 +4693,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attribu
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -5099,7 +4720,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("dateFor
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updateTime").ToString());
@@ -5107,7 +4728,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updated
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -5116,7 +4737,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -5143,7 +4764,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("dateFormatter
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updateTime").ToString());
@@ -5151,7 +4772,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updatedBy").T
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -5160,7 +4781,7 @@ Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attribu
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -5187,618 +4808,386 @@ Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("dateFor
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateAtlasTypeDefinitions(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call UpdateAtlasTypeDefinitions and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.UpdateAtlasTypeDefinitions(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.UpdateAtlasTypeDefinitions(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call UpdateAtlasTypeDefinitions with all request content, and how to parse the result.
+This sample shows how to call UpdateAtlasTypeDefinitions with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
-
-var data = new {
-    businessMetadataDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    classificationDefs = new[] {
-        new {
-            entityTypes = new[] {
-                "<String>"
-            },
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    entityDefs = new[] {
-        new {
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            relationshipAttributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    enumDefs = new[] {
-        new {
-            defaultValue = "<defaultValue>",
-            elementDefs = new[] {
-                new {
-                    description = "<description>",
-                    ordinal = 123.45f,
-                    value = "<value>",
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    relationshipDefs = new[] {
-        new {
-            endDef1 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            endDef2 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            relationshipCategory = "ASSOCIATION",
-            relationshipLabel = "<relationshipLabel>",
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    structDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    termTemplateDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-};
-
-Response response = client.UpdateAtlasTypeDefinitions(RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["businessMetadataDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["params"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["type"] = "<type>",
+}
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["calendar"] = 123.45F,
+["dateInstance"] = null
+,
+["dateTimeInstance"] = null
+,
+["instance"] = null
+,
+["lenient"] = true,
+["numberFormat"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["currency"] = "<currency>",
+["currencyInstance"] = null
+,
+["groupingUsed"] = true,
+["instance"] = null
+,
+["integerInstance"] = null
+,
+["maximumFractionDigits"] = 1234,
+["maximumIntegerDigits"] = 1234,
+["minimumFractionDigits"] = 1234,
+["minimumIntegerDigits"] = 1234,
+["numberInstance"] = null
+,
+["parseIntegerOnly"] = true,
+["percentInstance"] = null
+,
+["roundingMode"] = "UP",
+},
+["timeInstance"] = null
+,
+["timeZone"] = new Dictionary<string, object>()
+{
+["dstSavings"] = 1234,
+["id"] = "<id>",
+["availableIds"] = new List<object>()
+{
+"<availableIds>"
+},
+["default"] = null
+,
+["displayName"] = "<displayName>",
+["rawOffset"] = 1234,
+},
+},
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["classificationDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["entityDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["relationshipAttributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["isLegacyAttribute"] = true,
+["relationshipTypeName"] = "<relationshipTypeName>",
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+null
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["enumDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["defaultValue"] = "<defaultValue>",
+["elementDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["ordinal"] = 123.45F,
+["value"] = "<value>",
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["relationshipDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endDef1"] = new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["description"] = "<description>",
+["isContainer"] = true,
+["isLegacyAttribute"] = true,
+["name"] = "<name>",
+["type"] = "<type>",
+},
+["endDef2"] = null
+,
+["relationshipCategory"] = "ASSOCIATION",
+["relationshipLabel"] = "<relationshipLabel>",
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["structDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["termTemplateDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+});
+Response response = client.UpdateAtlasTypeDefinitions(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -5807,7 +5196,7 @@ Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("att
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -5834,7 +5223,7 @@ Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("dat
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("updateTime").ToString());
@@ -5845,7 +5234,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("entit
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("subTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("superTypes")[0].ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -5854,7 +5243,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attri
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -5881,7 +5270,7 @@ Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("dateF
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("updateTime").ToString());
@@ -5893,7 +5282,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("superTypes")[
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -5902,12 +5291,12 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipA
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -5916,7 +5305,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -5943,7 +5332,7 @@ Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("dateFormatter
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("updateTime").ToString());
@@ -5977,7 +5366,7 @@ Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("dateFormatter")
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("updateTime").ToString());
@@ -5999,7 +5388,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("endDef2
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipCategory").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipLabel").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -6008,7 +5397,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attribu
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -6035,7 +5424,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("dateFor
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updateTime").ToString());
@@ -6043,7 +5432,7 @@ Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updated
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -6052,7 +5441,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -6079,7 +5468,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("dateFormatter
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updateTime").ToString());
@@ -6087,7 +5476,7 @@ Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updatedBy").T
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("lastModifiedTS").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -6096,7 +5485,7 @@ Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attribu
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -6123,1263 +5512,829 @@ Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("dateFor
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteTypeDefinitionsAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call DeleteTypeDefinitionsAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-var data = new {};
-
-Response response = await client.DeleteTypeDefinitionsAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.DeleteTypeDefinitionsAsync(content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call DeleteTypeDefinitionsAsync with all request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
-
-var data = new {
-    businessMetadataDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    classificationDefs = new[] {
-        new {
-            entityTypes = new[] {
-                "<String>"
-            },
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    entityDefs = new[] {
-        new {
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            relationshipAttributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    enumDefs = new[] {
-        new {
-            defaultValue = "<defaultValue>",
-            elementDefs = new[] {
-                new {
-                    description = "<description>",
-                    ordinal = 123.45f,
-                    value = "<value>",
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    relationshipDefs = new[] {
-        new {
-            endDef1 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            endDef2 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            relationshipCategory = "ASSOCIATION",
-            relationshipLabel = "<relationshipLabel>",
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    structDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    termTemplateDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-};
-
-Response response = await client.DeleteTypeDefinitionsAsync(RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["businessMetadataDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["params"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["type"] = "<type>",
+}
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["calendar"] = 123.45F,
+["dateInstance"] = null
+,
+["dateTimeInstance"] = null
+,
+["instance"] = null
+,
+["lenient"] = true,
+["numberFormat"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["currency"] = "<currency>",
+["currencyInstance"] = null
+,
+["groupingUsed"] = true,
+["instance"] = null
+,
+["integerInstance"] = null
+,
+["maximumFractionDigits"] = 1234,
+["maximumIntegerDigits"] = 1234,
+["minimumFractionDigits"] = 1234,
+["minimumIntegerDigits"] = 1234,
+["numberInstance"] = null
+,
+["parseIntegerOnly"] = true,
+["percentInstance"] = null
+,
+["roundingMode"] = "UP",
+},
+["timeInstance"] = null
+,
+["timeZone"] = new Dictionary<string, object>()
+{
+["dstSavings"] = 1234,
+["id"] = "<id>",
+["availableIds"] = new List<object>()
+{
+"<availableIds>"
+},
+["default"] = null
+,
+["displayName"] = "<displayName>",
+["rawOffset"] = 1234,
+},
+},
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["classificationDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["entityDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["relationshipAttributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["isLegacyAttribute"] = true,
+["relationshipTypeName"] = "<relationshipTypeName>",
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+null
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["enumDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["defaultValue"] = "<defaultValue>",
+["elementDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["ordinal"] = 123.45F,
+["value"] = "<value>",
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["relationshipDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endDef1"] = new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["description"] = "<description>",
+["isContainer"] = true,
+["isLegacyAttribute"] = true,
+["name"] = "<name>",
+["type"] = "<type>",
+},
+["endDef2"] = null
+,
+["relationshipCategory"] = "ASSOCIATION",
+["relationshipLabel"] = "<relationshipLabel>",
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["structDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["termTemplateDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+});
+Response response = await client.DeleteTypeDefinitionsAsync(content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteTypeDefinitions(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call DeleteTypeDefinitions.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.DeleteTypeDefinitions(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.DeleteTypeDefinitions(content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call DeleteTypeDefinitions with all request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
-
-var data = new {
-    businessMetadataDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    classificationDefs = new[] {
-        new {
-            entityTypes = new[] {
-                "<String>"
-            },
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    entityDefs = new[] {
-        new {
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            relationshipAttributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    enumDefs = new[] {
-        new {
-            defaultValue = "<defaultValue>",
-            elementDefs = new[] {
-                new {
-                    description = "<description>",
-                    ordinal = 123.45f,
-                    value = "<value>",
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    relationshipDefs = new[] {
-        new {
-            endDef1 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            endDef2 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            relationshipCategory = "ASSOCIATION",
-            relationshipLabel = "<relationshipLabel>",
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    structDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-    termTemplateDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-};
-
-Response response = client.DeleteTypeDefinitions(RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["businessMetadataDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["params"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["type"] = "<type>",
+}
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["calendar"] = 123.45F,
+["dateInstance"] = null
+,
+["dateTimeInstance"] = null
+,
+["instance"] = null
+,
+["lenient"] = true,
+["numberFormat"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["currency"] = "<currency>",
+["currencyInstance"] = null
+,
+["groupingUsed"] = true,
+["instance"] = null
+,
+["integerInstance"] = null
+,
+["maximumFractionDigits"] = 1234,
+["maximumIntegerDigits"] = 1234,
+["minimumFractionDigits"] = 1234,
+["minimumIntegerDigits"] = 1234,
+["numberInstance"] = null
+,
+["parseIntegerOnly"] = true,
+["percentInstance"] = null
+,
+["roundingMode"] = "UP",
+},
+["timeInstance"] = null
+,
+["timeZone"] = new Dictionary<string, object>()
+{
+["dstSavings"] = 1234,
+["id"] = "<id>",
+["availableIds"] = new List<object>()
+{
+"<availableIds>"
+},
+["default"] = null
+,
+["displayName"] = "<displayName>",
+["rawOffset"] = 1234,
+},
+},
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["classificationDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["entityDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["relationshipAttributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["isLegacyAttribute"] = true,
+["relationshipTypeName"] = "<relationshipTypeName>",
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+null
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["enumDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["defaultValue"] = "<defaultValue>",
+["elementDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["ordinal"] = 123.45F,
+["value"] = "<value>",
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["relationshipDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endDef1"] = new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["description"] = "<description>",
+["isContainer"] = true,
+["isLegacyAttribute"] = true,
+["name"] = "<name>",
+["type"] = "<type>",
+},
+["endDef2"] = null
+,
+["relationshipCategory"] = "ASSOCIATION",
+["relationshipLabel"] = "<relationshipLabel>",
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["structDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+    ["termTemplateDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+});
+Response response = client.DeleteTypeDefinitions(content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTypeDefinitionHeadersAsync(bool?,string,RequestContext)">
-<example>
-This sample shows how to call GetTypeDefinitionHeadersAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTypeDefinitionHeadersAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetTypeDefinitionHeadersAsync(null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetTypeDefinitionHeadersAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetTypeDefinitionHeadersAsync(true, "<type>", new RequestContext());
+Response response = await client.GetTypeDefinitionHeadersAsync(true, "enum", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("category").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
 Console.WriteLine(result[0].GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTypeDefinitionHeaders(bool?,string,RequestContext)">
-<example>
-This sample shows how to call GetTypeDefinitionHeaders with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTypeDefinitionHeaders and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetTypeDefinitionHeaders(true, "<type>", new RequestContext());
+Response response = client.GetTypeDefinitionHeaders(null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetTypeDefinitionHeaders with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetTypeDefinitionHeaders(true, "enum", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("category").ToString());
 Console.WriteLine(result[0].GetProperty("guid").ToString());
 Console.WriteLine(result[0].GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTermTemplateDefByGuidAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetTermTemplateDefByGuidAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTermTemplateDefByGuidAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetTermTemplateDefByGuidAsync("<guid>", new RequestContext());
+Response response = await client.GetTermTemplateDefByGuidAsync("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTermTemplateDefByGuidAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetTermTemplateDefByGuidAsync("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -7388,7 +6343,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -7415,29 +6370,39 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTermTemplateDefByGuid(string,RequestContext)">
-<example>
-This sample shows how to call GetTermTemplateDefByGuid with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTermTemplateDefByGuid and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetTermTemplateDefByGuid("<guid>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTermTemplateDefByGuid with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetTermTemplateDefByGuid("<guid>", new RequestContext());
+Response response = client.GetTermTemplateDefByGuid("<guid>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -7446,7 +6411,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -7473,29 +6438,39 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTermTemplateDefByNameAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetTermTemplateDefByNameAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTermTemplateDefByNameAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = await client.GetTermTemplateDefByNameAsync("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTermTemplateDefByNameAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = await client.GetTermTemplateDefByNameAsync("<name>", new RequestContext());
+Response response = await client.GetTermTemplateDefByNameAsync("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -7504,7 +6479,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -7531,29 +6506,39 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTermTemplateDefByName(string,RequestContext)">
-<example>
-This sample shows how to call GetTermTemplateDefByName with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTermTemplateDefByName and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+
+Response response = client.GetTermTemplateDefByName("<name>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTermTemplateDefByName with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-Response response = client.GetTermTemplateDefByName("<name>", new RequestContext());
+Response response = client.GetTermTemplateDefByName("<name>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -7562,7 +6547,7 @@ Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isIndexabl
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
 Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -7589,15 +6574,14 @@ Console.WriteLine(result.GetProperty("dateFormatter").GetProperty("timeZone").Ge
 Console.WriteLine(result.GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("guid").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("serviceType").ToString());
 Console.WriteLine(result.GetProperty("typeVersion").ToString());
 Console.WriteLine(result.GetProperty("updateTime").ToString());
 Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewCatalogClient.cs b/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewCatalogClient.cs
index 5cdcfdec318c..daf4806fa5a6 100644
--- a/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewCatalogClient.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewCatalogClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Catalog;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,13 +23,12 @@ public class Samples_PurviewCatalogClient
         [Ignore("Only validating compilation of examples")]
         public void Example_Search()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = client.Search(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.Search(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -39,38 +38,36 @@ public void Example_Search()
         [Ignore("Only validating compilation of examples")]
         public void Example_Search_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                keywords = "<keywords>",
-                offset = 1234,
-                limit = 1234,
-                filter = new { },
-                facets = new[] {
-        new {
-            count = 1234,
-            facet = "<facet>",
-            sort = new {},
-        }
-    },
-                taxonomySetting = new
+                ["keywords"] = "<keywords>",
+                ["offset"] = 1234,
+                ["limit"] = 1234,
+                ["filter"] = new Dictionary<string, object>(),
+                ["facets"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["count"] = 1234,
+["facet"] = "<facet>",
+["sort"] = new Dictionary<string, object>(),
+}
+},
+                ["taxonomySetting"] = new Dictionary<string, object>()
                 {
-                    assetTypes = new[] {
-            "<String>"
-        },
-                    facet = new
-                    {
-                        count = 1234,
-                        facet = "<facet>",
-                        sort = new { },
-                    },
+                    ["assetTypes"] = new List<object>()
+{
+"<assetTypes>"
+},
+                    ["facet"] = null
+            ,
                 },
-            };
-
-            Response response = client.Search(RequestContent.Create(data));
+            });
+            Response response = client.Search(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("@search.count").ToString());
@@ -116,13 +113,12 @@ public void Example_Search_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Search_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = await client.SearchAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.SearchAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -132,38 +128,36 @@ public async Task Example_Search_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Search_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                keywords = "<keywords>",
-                offset = 1234,
-                limit = 1234,
-                filter = new { },
-                facets = new[] {
-        new {
-            count = 1234,
-            facet = "<facet>",
-            sort = new {},
-        }
-    },
-                taxonomySetting = new
+                ["keywords"] = "<keywords>",
+                ["offset"] = 1234,
+                ["limit"] = 1234,
+                ["filter"] = new Dictionary<string, object>(),
+                ["facets"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["count"] = 1234,
+["facet"] = "<facet>",
+["sort"] = new Dictionary<string, object>(),
+}
+},
+                ["taxonomySetting"] = new Dictionary<string, object>()
                 {
-                    assetTypes = new[] {
-            "<String>"
-        },
-                    facet = new
-                    {
-                        count = 1234,
-                        facet = "<facet>",
-                        sort = new { },
-                    },
+                    ["assetTypes"] = new List<object>()
+{
+"<assetTypes>"
+},
+                    ["facet"] = null
+            ,
                 },
-            };
-
-            Response response = await client.SearchAsync(RequestContent.Create(data));
+            });
+            Response response = await client.SearchAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("@search.count").ToString());
@@ -209,13 +203,12 @@ public async Task Example_Search_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_Suggest()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            Response response = client.Suggest(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.Suggest(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -225,18 +218,17 @@ public void Example_Suggest()
         [Ignore("Only validating compilation of examples")]
         public void Example_Suggest_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                keywords = "<keywords>",
-                limit = 1234,
-                filter = new { },
-            };
-
-            Response response = client.Suggest(RequestContent.Create(data));
+                ["keywords"] = "<keywords>",
+                ["limit"] = 1234,
+                ["filter"] = new Dictionary<string, object>(),
+            });
+            Response response = client.Suggest(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("value")[0].GetProperty("@search.score").ToString());
@@ -262,13 +254,12 @@ public void Example_Suggest_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Suggest_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            Response response = await client.SuggestAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.SuggestAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -278,18 +269,17 @@ public async Task Example_Suggest_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Suggest_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                keywords = "<keywords>",
-                limit = 1234,
-                filter = new { },
-            };
-
-            Response response = await client.SuggestAsync(RequestContent.Create(data));
+                ["keywords"] = "<keywords>",
+                ["limit"] = 1234,
+                ["filter"] = new Dictionary<string, object>(),
+            });
+            Response response = await client.SuggestAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("value")[0].GetProperty("@search.score").ToString());
@@ -315,13 +305,12 @@ public async Task Example_Suggest_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_Browse()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            Response response = client.Browse(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.Browse(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -331,19 +320,18 @@ public void Example_Browse()
         [Ignore("Only validating compilation of examples")]
         public void Example_Browse_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                entityType = "<entityType>",
-                path = "<path>",
-                limit = 1234,
-                offset = 1234,
-            };
-
-            Response response = client.Browse(RequestContent.Create(data));
+                ["entityType"] = "<entityType>",
+                ["path"] = "<path>",
+                ["limit"] = 1234,
+                ["offset"] = 1234,
+            });
+            Response response = client.Browse(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("@search.count").ToString());
@@ -363,13 +351,12 @@ public void Example_Browse_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Browse_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = await client.BrowseAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.BrowseAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -379,19 +366,18 @@ public async Task Example_Browse_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Browse_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                entityType = "<entityType>",
-                path = "<path>",
-                limit = 1234,
-                offset = 1234,
-            };
-
-            Response response = await client.BrowseAsync(RequestContent.Create(data));
+                ["entityType"] = "<entityType>",
+                ["path"] = "<path>",
+                ["limit"] = 1234,
+                ["offset"] = 1234,
+            });
+            Response response = await client.BrowseAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("@search.count").ToString());
@@ -411,13 +397,12 @@ public async Task Example_Browse_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_AutoComplete()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            Response response = client.AutoComplete(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.AutoComplete(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -427,18 +412,17 @@ public void Example_AutoComplete()
         [Ignore("Only validating compilation of examples")]
         public void Example_AutoComplete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                keywords = "<keywords>",
-                limit = 1234,
-                filter = new { },
-            };
-
-            Response response = client.AutoComplete(RequestContent.Create(data));
+                ["keywords"] = "<keywords>",
+                ["limit"] = 1234,
+                ["filter"] = new Dictionary<string, object>(),
+            });
+            Response response = client.AutoComplete(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("value")[0].GetProperty("text").ToString());
@@ -449,13 +433,12 @@ public void Example_AutoComplete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AutoComplete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            Response response = await client.AutoCompleteAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.AutoCompleteAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -465,18 +448,17 @@ public async Task Example_AutoComplete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AutoComplete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCatalogClient client = new PurviewCatalogClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                keywords = "<keywords>",
-                limit = 1234,
-                filter = new { },
-            };
-
-            Response response = await client.AutoCompleteAsync(RequestContent.Create(data));
+                ["keywords"] = "<keywords>",
+                ["limit"] = 1234,
+                ["filter"] = new Dictionary<string, object>(),
+            });
+            Response response = await client.AutoCompleteAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("value")[0].GetProperty("text").ToString());
diff --git a/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewCollections.cs b/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewCollections.cs
index 68469ca6f627..6b7beb1a7906 100644
--- a/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewCollections.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewCollections.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Catalog;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,13 +23,12 @@ internal class Samples_PurviewCollections
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateEntity()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdateEntity("<collection>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdateEntity("<collection>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -39,224 +38,150 @@ public void Example_CreateOrUpdateEntity()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateEntity_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                entity = new
+                ["entity"] = new Dictionary<string, object>()
                 {
-                    businessAttributes = new
+                    ["businessAttributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-                    createTime = 123.45f,
-                    createdBy = "<createdBy>",
-                    customAttributes = new
+                    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                    ["createTime"] = 123.45F,
+                    ["createdBy"] = "<createdBy>",
+                    ["customAttributes"] = new Dictionary<string, object>()
                     {
-                        key = "<String>",
+                        ["key"] = "<customAttributes>",
                     },
-                    guid = "<guid>",
-                    homeId = "<homeId>",
-                    isIncomplete = true,
-                    labels = new[] {
-            "<String>"
-        },
-                    meanings = new[] {
-            new {
-                confidence = 1234,
-                createdBy = "<createdBy>",
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DISCOVERED",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-                    provenanceType = 123.45f,
-                    proxy = true,
-                    relationshipAttributes = new
+                    ["guid"] = "<guid>",
+                    ["homeId"] = "<homeId>",
+                    ["isIncomplete"] = true,
+                    ["labels"] = new List<object>()
+{
+"<labels>"
+},
+                    ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                    ["provenanceType"] = 123.45F,
+                    ["proxy"] = true,
+                    ["relationshipAttributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
-                    },
-                    status = "ACTIVE",
-                    updateTime = 123.45f,
-                    updatedBy = "<updatedBy>",
-                    version = 123.45f,
-                    source = "<source>",
-                    sourceDetails = new
+                        ["key"] = new Dictionary<string, object>(),
+                    },
+                    ["status"] = "ACTIVE",
+                    ["updateTime"] = 123.45F,
+                    ["updatedBy"] = "<updatedBy>",
+                    ["version"] = 123.45F,
+                    ["source"] = "<source>",
+                    ["sourceDetails"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    contacts = new
+                    ["contacts"] = new Dictionary<string, object>()
                     {
-                        key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
+                        ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
                     },
-                    attributes = new
+                    ["attributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
+                    ["typeName"] = "<typeName>",
+                    ["lastModifiedTS"] = "<lastModifiedTS>",
                 },
-                referredEntities = new
+                ["referredEntities"] = new Dictionary<string, object>()
                 {
-                    key = new
-                    {
-                        businessAttributes = new
-                        {
-                            key = new { },
-                        },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        createTime = 123.45f,
-                        createdBy = "<createdBy>",
-                        customAttributes = new
-                        {
-                            key = "<String>",
-                        },
-                        guid = "<guid>",
-                        homeId = "<homeId>",
-                        isIncomplete = true,
-                        labels = new[] {
-                "<String>"
-            },
-                        meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        provenanceType = 123.45f,
-                        proxy = true,
-                        relationshipAttributes = new
-                        {
-                            key = new { },
-                        },
-                        status = "ACTIVE",
-                        updateTime = 123.45f,
-                        updatedBy = "<updatedBy>",
-                        version = 123.45f,
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        contacts = new
-                        {
-                            key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
+                    ["key"] = null
+            ,
                 },
-            };
-
-            Response response = client.CreateOrUpdateEntity("<collection>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateEntity("<collection>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -265,8 +190,8 @@ public void Example_CreateOrUpdateEntity_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -285,7 +210,7 @@ public void Example_CreateOrUpdateEntity_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -294,13 +219,12 @@ public void Example_CreateOrUpdateEntity_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateEntity_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-            Response response = await client.CreateOrUpdateEntityAsync("<collection>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateEntityAsync("<collection>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -310,224 +234,150 @@ public async Task Example_CreateOrUpdateEntity_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateEntity_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                entity = new
+                ["entity"] = new Dictionary<string, object>()
                 {
-                    businessAttributes = new
+                    ["businessAttributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-                    createTime = 123.45f,
-                    createdBy = "<createdBy>",
-                    customAttributes = new
+                    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                    ["createTime"] = 123.45F,
+                    ["createdBy"] = "<createdBy>",
+                    ["customAttributes"] = new Dictionary<string, object>()
                     {
-                        key = "<String>",
+                        ["key"] = "<customAttributes>",
                     },
-                    guid = "<guid>",
-                    homeId = "<homeId>",
-                    isIncomplete = true,
-                    labels = new[] {
-            "<String>"
-        },
-                    meanings = new[] {
-            new {
-                confidence = 1234,
-                createdBy = "<createdBy>",
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DISCOVERED",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-                    provenanceType = 123.45f,
-                    proxy = true,
-                    relationshipAttributes = new
+                    ["guid"] = "<guid>",
+                    ["homeId"] = "<homeId>",
+                    ["isIncomplete"] = true,
+                    ["labels"] = new List<object>()
+{
+"<labels>"
+},
+                    ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                    ["provenanceType"] = 123.45F,
+                    ["proxy"] = true,
+                    ["relationshipAttributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
-                    },
-                    status = "ACTIVE",
-                    updateTime = 123.45f,
-                    updatedBy = "<updatedBy>",
-                    version = 123.45f,
-                    source = "<source>",
-                    sourceDetails = new
+                        ["key"] = new Dictionary<string, object>(),
+                    },
+                    ["status"] = "ACTIVE",
+                    ["updateTime"] = 123.45F,
+                    ["updatedBy"] = "<updatedBy>",
+                    ["version"] = 123.45F,
+                    ["source"] = "<source>",
+                    ["sourceDetails"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    contacts = new
+                    ["contacts"] = new Dictionary<string, object>()
                     {
-                        key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
+                        ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
                     },
-                    attributes = new
+                    ["attributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
+                    ["typeName"] = "<typeName>",
+                    ["lastModifiedTS"] = "<lastModifiedTS>",
                 },
-                referredEntities = new
+                ["referredEntities"] = new Dictionary<string, object>()
                 {
-                    key = new
-                    {
-                        businessAttributes = new
-                        {
-                            key = new { },
-                        },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        createTime = 123.45f,
-                        createdBy = "<createdBy>",
-                        customAttributes = new
-                        {
-                            key = "<String>",
-                        },
-                        guid = "<guid>",
-                        homeId = "<homeId>",
-                        isIncomplete = true,
-                        labels = new[] {
-                "<String>"
-            },
-                        meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        provenanceType = 123.45f,
-                        proxy = true,
-                        relationshipAttributes = new
-                        {
-                            key = new { },
-                        },
-                        status = "ACTIVE",
-                        updateTime = 123.45f,
-                        updatedBy = "<updatedBy>",
-                        version = 123.45f,
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        contacts = new
-                        {
-                            key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
+                    ["key"] = null
+            ,
                 },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                },
-            };
-
-            Response response = await client.CreateOrUpdateEntityAsync("<collection>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateEntityAsync("<collection>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -536,8 +386,8 @@ public async Task Example_CreateOrUpdateEntity_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -556,7 +406,7 @@ public async Task Example_CreateOrUpdateEntity_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -565,13 +415,12 @@ public async Task Example_CreateOrUpdateEntity_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateEntityInBulk()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-            Response response = client.CreateOrUpdateEntityInBulk("<collection>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdateEntityInBulk("<collection>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -581,219 +430,153 @@ public void Example_CreateOrUpdateEntityInBulk()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateEntityInBulk_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                entities = new[] {
-        new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                referredEntities = new
+                ["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["businessAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["customAttributes"] = new Dictionary<string, object>()
+{
+["key"] = "<customAttributes>",
+},
+["guid"] = "<guid>",
+["homeId"] = "<homeId>",
+["isIncomplete"] = true,
+["labels"] = new List<object>()
+{
+"<labels>"
+},
+["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["provenanceType"] = 123.45F,
+["proxy"] = true,
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["status"] = "ACTIVE",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["contacts"] = new Dictionary<string, object>()
+{
+["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["referredEntities"] = new Dictionary<string, object>()
                 {
-                    key = new
-                    {
-                        businessAttributes = new
-                        {
-                            key = new { },
-                        },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        createTime = 123.45f,
-                        createdBy = "<createdBy>",
-                        customAttributes = new
-                        {
-                            key = "<String>",
-                        },
-                        guid = "<guid>",
-                        homeId = "<homeId>",
-                        isIncomplete = true,
-                        labels = new[] {
-                "<String>"
-            },
-                        meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        provenanceType = 123.45f,
-                        proxy = true,
-                        relationshipAttributes = new
-                        {
-                            key = new { },
-                        },
-                        status = "ACTIVE",
-                        updateTime = 123.45f,
-                        updatedBy = "<updatedBy>",
-                        version = 123.45f,
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        contacts = new
-                        {
-                            key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
+                    ["key"] = null
+            ,
                 },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                },
-            };
-
-            Response response = client.CreateOrUpdateEntityInBulk("<collection>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateEntityInBulk("<collection>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -802,8 +585,8 @@ public void Example_CreateOrUpdateEntityInBulk_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -822,7 +605,7 @@ public void Example_CreateOrUpdateEntityInBulk_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -831,13 +614,12 @@ public void Example_CreateOrUpdateEntityInBulk_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateEntityInBulk_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateEntityInBulkAsync("<collection>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateEntityInBulkAsync("<collection>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -847,219 +629,153 @@ public async Task Example_CreateOrUpdateEntityInBulk_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateEntityInBulk_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                entities = new[] {
-        new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                referredEntities = new
+                ["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["businessAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["customAttributes"] = new Dictionary<string, object>()
+{
+["key"] = "<customAttributes>",
+},
+["guid"] = "<guid>",
+["homeId"] = "<homeId>",
+["isIncomplete"] = true,
+["labels"] = new List<object>()
+{
+"<labels>"
+},
+["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["provenanceType"] = 123.45F,
+["proxy"] = true,
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["status"] = "ACTIVE",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["contacts"] = new Dictionary<string, object>()
+{
+["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["referredEntities"] = new Dictionary<string, object>()
                 {
-                    key = new
-                    {
-                        businessAttributes = new
-                        {
-                            key = new { },
-                        },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        createTime = 123.45f,
-                        createdBy = "<createdBy>",
-                        customAttributes = new
-                        {
-                            key = "<String>",
-                        },
-                        guid = "<guid>",
-                        homeId = "<homeId>",
-                        isIncomplete = true,
-                        labels = new[] {
-                "<String>"
-            },
-                        meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        provenanceType = 123.45f,
-                        proxy = true,
-                        relationshipAttributes = new
-                        {
-                            key = new { },
-                        },
-                        status = "ACTIVE",
-                        updateTime = 123.45f,
-                        updatedBy = "<updatedBy>",
-                        version = 123.45f,
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        contacts = new
-                        {
-                            key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
+                    ["key"] = null
+            ,
                 },
-            };
-
-            Response response = await client.CreateOrUpdateEntityInBulkAsync("<collection>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateEntityInBulkAsync("<collection>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1068,8 +784,8 @@ public async Task Example_CreateOrUpdateEntityInBulk_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1088,7 +804,7 @@ public async Task Example_CreateOrUpdateEntityInBulk_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -1097,13 +813,12 @@ public async Task Example_CreateOrUpdateEntityInBulk_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_MoveEntitiesToCollection()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-            var data = new { };
-
-            Response response = client.MoveEntitiesToCollection("<collection>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.MoveEntitiesToCollection("<collection>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1113,52 +828,52 @@ public void Example_MoveEntitiesToCollection()
         [Ignore("Only validating compilation of examples")]
         public void Example_MoveEntitiesToCollection_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                entityGuids = new[] {
-        "<String>"
-    },
-            };
-
-            Response response = client.MoveEntitiesToCollection("<collection>", RequestContent.Create(data));
+                ["entityGuids"] = new List<object>()
+{
+"<entityGuids>"
+},
+            });
+            Response response = client.MoveEntitiesToCollection("<collection>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1167,8 +882,8 @@ public void Example_MoveEntitiesToCollection_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1187,7 +902,7 @@ public void Example_MoveEntitiesToCollection_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -1196,13 +911,12 @@ public void Example_MoveEntitiesToCollection_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_MoveEntitiesToCollection_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-            Response response = await client.MoveEntitiesToCollectionAsync("<collection>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.MoveEntitiesToCollectionAsync("<collection>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1212,52 +926,52 @@ public async Task Example_MoveEntitiesToCollection_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_MoveEntitiesToCollection_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewCollections client = new PurviewCatalogClient(endpoint, credential).GetPurviewCollectionsClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                entityGuids = new[] {
-        "<String>"
-    },
-            };
-
-            Response response = await client.MoveEntitiesToCollectionAsync("<collection>", RequestContent.Create(data));
+                ["entityGuids"] = new List<object>()
+{
+"<entityGuids>"
+},
+            });
+            Response response = await client.MoveEntitiesToCollectionAsync("<collection>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1266,8 +980,8 @@ public async Task Example_MoveEntitiesToCollection_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1286,7 +1000,7 @@ public async Task Example_MoveEntitiesToCollection_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
diff --git a/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewEntities.cs b/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewEntities.cs
index 71737b156057..254209599ad6 100644
--- a/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewEntities.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewEntities.cs
@@ -11,6 +11,7 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Catalog;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,13 +24,12 @@ internal class Samples_PurviewEntities
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdate(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdate(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -39,224 +39,150 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                entity = new
+                ["entity"] = new Dictionary<string, object>()
                 {
-                    businessAttributes = new
+                    ["businessAttributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-                    createTime = 123.45f,
-                    createdBy = "<createdBy>",
-                    customAttributes = new
+                    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                    ["createTime"] = 123.45F,
+                    ["createdBy"] = "<createdBy>",
+                    ["customAttributes"] = new Dictionary<string, object>()
                     {
-                        key = "<String>",
+                        ["key"] = "<customAttributes>",
                     },
-                    guid = "<guid>",
-                    homeId = "<homeId>",
-                    isIncomplete = true,
-                    labels = new[] {
-            "<String>"
-        },
-                    meanings = new[] {
-            new {
-                confidence = 1234,
-                createdBy = "<createdBy>",
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DISCOVERED",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-                    provenanceType = 123.45f,
-                    proxy = true,
-                    relationshipAttributes = new
+                    ["guid"] = "<guid>",
+                    ["homeId"] = "<homeId>",
+                    ["isIncomplete"] = true,
+                    ["labels"] = new List<object>()
+{
+"<labels>"
+},
+                    ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                    ["provenanceType"] = 123.45F,
+                    ["proxy"] = true,
+                    ["relationshipAttributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    status = "ACTIVE",
-                    updateTime = 123.45f,
-                    updatedBy = "<updatedBy>",
-                    version = 123.45f,
-                    source = "<source>",
-                    sourceDetails = new
+                    ["status"] = "ACTIVE",
+                    ["updateTime"] = 123.45F,
+                    ["updatedBy"] = "<updatedBy>",
+                    ["version"] = 123.45F,
+                    ["source"] = "<source>",
+                    ["sourceDetails"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    contacts = new
+                    ["contacts"] = new Dictionary<string, object>()
                     {
-                        key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
+                        ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
                     },
-                    attributes = new
+                    ["attributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
+                    ["typeName"] = "<typeName>",
+                    ["lastModifiedTS"] = "<lastModifiedTS>",
                 },
-                referredEntities = new
+                ["referredEntities"] = new Dictionary<string, object>()
                 {
-                    key = new
-                    {
-                        businessAttributes = new
-                        {
-                            key = new { },
-                        },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        createTime = 123.45f,
-                        createdBy = "<createdBy>",
-                        customAttributes = new
-                        {
-                            key = "<String>",
-                        },
-                        guid = "<guid>",
-                        homeId = "<homeId>",
-                        isIncomplete = true,
-                        labels = new[] {
-                "<String>"
-            },
-                        meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        provenanceType = 123.45f,
-                        proxy = true,
-                        relationshipAttributes = new
-                        {
-                            key = new { },
-                        },
-                        status = "ACTIVE",
-                        updateTime = 123.45f,
-                        updatedBy = "<updatedBy>",
-                        version = 123.45f,
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        contacts = new
-                        {
-                            key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
+                    ["key"] = null
+            ,
                 },
-            };
-
-            Response response = client.CreateOrUpdate(RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdate(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -265,8 +191,8 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -285,7 +211,7 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -294,13 +220,12 @@ public void Example_CreateOrUpdate_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -310,224 +235,150 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                entity = new
+                ["entity"] = new Dictionary<string, object>()
                 {
-                    businessAttributes = new
+                    ["businessAttributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-                    createTime = 123.45f,
-                    createdBy = "<createdBy>",
-                    customAttributes = new
+                    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                    ["createTime"] = 123.45F,
+                    ["createdBy"] = "<createdBy>",
+                    ["customAttributes"] = new Dictionary<string, object>()
                     {
-                        key = "<String>",
+                        ["key"] = "<customAttributes>",
                     },
-                    guid = "<guid>",
-                    homeId = "<homeId>",
-                    isIncomplete = true,
-                    labels = new[] {
-            "<String>"
-        },
-                    meanings = new[] {
-            new {
-                confidence = 1234,
-                createdBy = "<createdBy>",
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DISCOVERED",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-                    provenanceType = 123.45f,
-                    proxy = true,
-                    relationshipAttributes = new
+                    ["guid"] = "<guid>",
+                    ["homeId"] = "<homeId>",
+                    ["isIncomplete"] = true,
+                    ["labels"] = new List<object>()
+{
+"<labels>"
+},
+                    ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                    ["provenanceType"] = 123.45F,
+                    ["proxy"] = true,
+                    ["relationshipAttributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    status = "ACTIVE",
-                    updateTime = 123.45f,
-                    updatedBy = "<updatedBy>",
-                    version = 123.45f,
-                    source = "<source>",
-                    sourceDetails = new
+                    ["status"] = "ACTIVE",
+                    ["updateTime"] = 123.45F,
+                    ["updatedBy"] = "<updatedBy>",
+                    ["version"] = 123.45F,
+                    ["source"] = "<source>",
+                    ["sourceDetails"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    contacts = new
+                    ["contacts"] = new Dictionary<string, object>()
                     {
-                        key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
+                        ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
                     },
-                    attributes = new
+                    ["attributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
+                    ["typeName"] = "<typeName>",
+                    ["lastModifiedTS"] = "<lastModifiedTS>",
                 },
-                referredEntities = new
+                ["referredEntities"] = new Dictionary<string, object>()
                 {
-                    key = new
-                    {
-                        businessAttributes = new
-                        {
-                            key = new { },
-                        },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        createTime = 123.45f,
-                        createdBy = "<createdBy>",
-                        customAttributes = new
-                        {
-                            key = "<String>",
-                        },
-                        guid = "<guid>",
-                        homeId = "<homeId>",
-                        isIncomplete = true,
-                        labels = new[] {
-                "<String>"
-            },
-                        meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        provenanceType = 123.45f,
-                        proxy = true,
-                        relationshipAttributes = new
-                        {
-                            key = new { },
-                        },
-                        status = "ACTIVE",
-                        updateTime = 123.45f,
-                        updatedBy = "<updatedBy>",
-                        version = 123.45f,
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        contacts = new
-                        {
-                            key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
+                    ["key"] = null
+            ,
                 },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                },
-            };
-
-            Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -536,8 +387,8 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -556,7 +407,7 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -565,11 +416,14 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetByGuids()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetByGuids(new string[] { "<guids>" }, true, true, new string[] { "<excludeRelationshipTypes>" }, new RequestContext());
+            Response response = client.GetByGuids(new List<string>()
+{
+"<guids>"
+}, null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -579,14 +433,20 @@ public void Example_GetByGuids()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetByGuids_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetByGuids(new string[] { "<guids>" }, true, true, new string[] { "<excludeRelationshipTypes>" }, new RequestContext());
+            Response response = client.GetByGuids(new List<string>()
+{
+"<guids>"
+}, true, true, new List<string>()
+{
+"<excludeRelationshipTypes>"
+}, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -594,13 +454,13 @@ public void Example_GetByGuids_AllParameters()
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createTime").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("homeId").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("isIncomplete").ToString());
@@ -617,72 +477,75 @@ public void Example_GetByGuids_AllParameters()
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("provenanceType").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updateTime").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updatedBy").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetByGuids_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetByGuidsAsync(new string[] { "<guids>" }, true, true, new string[] { "<excludeRelationshipTypes>" }, new RequestContext());
+            Response response = await client.GetByGuidsAsync(new List<string>()
+{
+"<guids>"
+}, null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -692,14 +555,20 @@ public async Task Example_GetByGuids_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetByGuids_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetByGuidsAsync(new string[] { "<guids>" }, true, true, new string[] { "<excludeRelationshipTypes>" }, new RequestContext());
+            Response response = await client.GetByGuidsAsync(new List<string>()
+{
+"<guids>"
+}, true, true, new List<string>()
+{
+"<excludeRelationshipTypes>"
+}, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -707,13 +576,13 @@ public async Task Example_GetByGuids_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createTime").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("homeId").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("isIncomplete").ToString());
@@ -730,74 +599,73 @@ public async Task Example_GetByGuids_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("provenanceType").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updateTime").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updatedBy").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateEntities()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdateEntities(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdateEntities(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -807,219 +675,153 @@ public void Example_CreateOrUpdateEntities()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateEntities_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                entities = new[] {
-        new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                referredEntities = new
+                ["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["businessAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["customAttributes"] = new Dictionary<string, object>()
+{
+["key"] = "<customAttributes>",
+},
+["guid"] = "<guid>",
+["homeId"] = "<homeId>",
+["isIncomplete"] = true,
+["labels"] = new List<object>()
+{
+"<labels>"
+},
+["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["provenanceType"] = 123.45F,
+["proxy"] = true,
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["status"] = "ACTIVE",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["contacts"] = new Dictionary<string, object>()
+{
+["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["referredEntities"] = new Dictionary<string, object>()
                 {
-                    key = new
-                    {
-                        businessAttributes = new
-                        {
-                            key = new { },
-                        },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        createTime = 123.45f,
-                        createdBy = "<createdBy>",
-                        customAttributes = new
-                        {
-                            key = "<String>",
-                        },
-                        guid = "<guid>",
-                        homeId = "<homeId>",
-                        isIncomplete = true,
-                        labels = new[] {
-                "<String>"
-            },
-                        meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        provenanceType = 123.45f,
-                        proxy = true,
-                        relationshipAttributes = new
-                        {
-                            key = new { },
-                        },
-                        status = "ACTIVE",
-                        updateTime = 123.45f,
-                        updatedBy = "<updatedBy>",
-                        version = 123.45f,
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        contacts = new
-                        {
-                            key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
+                    ["key"] = null
+            ,
                 },
-            };
-
-            Response response = client.CreateOrUpdateEntities(RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateEntities(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1028,8 +830,8 @@ public void Example_CreateOrUpdateEntities_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1048,7 +850,7 @@ public void Example_CreateOrUpdateEntities_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -1057,13 +859,12 @@ public void Example_CreateOrUpdateEntities_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateEntities_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.CreateOrUpdateEntitiesAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateEntitiesAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1073,219 +874,153 @@ public async Task Example_CreateOrUpdateEntities_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateEntities_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                entities = new[] {
-        new {
-            businessAttributes = new {
-                key = new {},
-            },
-            classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            customAttributes = new {
-                key = "<String>",
-            },
-            guid = "<guid>",
-            homeId = "<homeId>",
-            isIncomplete = true,
-            labels = new[] {
-                "<String>"
-            },
-            meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-            provenanceType = 123.45f,
-            proxy = true,
-            relationshipAttributes = new {
-                key = new {},
-            },
-            status = "ACTIVE",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            contacts = new {
-                key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                referredEntities = new
+                ["entities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["businessAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["customAttributes"] = new Dictionary<string, object>()
+{
+["key"] = "<customAttributes>",
+},
+["guid"] = "<guid>",
+["homeId"] = "<homeId>",
+["isIncomplete"] = true,
+["labels"] = new List<object>()
+{
+"<labels>"
+},
+["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["provenanceType"] = 123.45F,
+["proxy"] = true,
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["status"] = "ACTIVE",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["contacts"] = new Dictionary<string, object>()
+{
+["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["referredEntities"] = new Dictionary<string, object>()
                 {
-                    key = new
-                    {
-                        businessAttributes = new
-                        {
-                            key = new { },
-                        },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        createTime = 123.45f,
-                        createdBy = "<createdBy>",
-                        customAttributes = new
-                        {
-                            key = "<String>",
-                        },
-                        guid = "<guid>",
-                        homeId = "<homeId>",
-                        isIncomplete = true,
-                        labels = new[] {
-                "<String>"
-            },
-                        meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        provenanceType = 123.45f,
-                        proxy = true,
-                        relationshipAttributes = new
-                        {
-                            key = new { },
-                        },
-                        status = "ACTIVE",
-                        updateTime = 123.45f,
-                        updatedBy = "<updatedBy>",
-                        version = 123.45f,
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        contacts = new
-                        {
-                            key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
+                    ["key"] = null
+            ,
                 },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                },
-            };
-
-            Response response = await client.CreateOrUpdateEntitiesAsync(RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateEntitiesAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1294,8 +1029,8 @@ public async Task Example_CreateOrUpdateEntities_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1314,7 +1049,7 @@ public async Task Example_CreateOrUpdateEntities_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -1323,11 +1058,14 @@ public async Task Example_CreateOrUpdateEntities_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteByGuids()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.DeleteByGuids(new string[] { "<guids>" }, new RequestContext());
+            Response response = client.DeleteByGuids(new List<string>()
+{
+"<guids>"
+}, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1337,45 +1075,48 @@ public void Example_DeleteByGuids()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteByGuids_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.DeleteByGuids(new string[] { "<guids>" }, new RequestContext());
+            Response response = client.DeleteByGuids(new List<string>()
+{
+"<guids>"
+}, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1384,8 +1125,8 @@ public void Example_DeleteByGuids_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1404,7 +1145,7 @@ public void Example_DeleteByGuids_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -1413,11 +1154,14 @@ public void Example_DeleteByGuids_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteByGuids_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.DeleteByGuidsAsync(new string[] { "<guids>" }, new RequestContext());
+            Response response = await client.DeleteByGuidsAsync(new List<string>()
+{
+"<guids>"
+}, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1427,45 +1171,48 @@ public async Task Example_DeleteByGuids_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteByGuids_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.DeleteByGuidsAsync(new string[] { "<guids>" }, new RequestContext());
+            Response response = await client.DeleteByGuidsAsync(new List<string>()
+{
+"<guids>"
+}, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1474,8 +1221,8 @@ public async Task Example_DeleteByGuids_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1494,7 +1241,7 @@ public async Task Example_DeleteByGuids_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -1503,13 +1250,12 @@ public async Task Example_DeleteByGuids_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddClassification()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new { };
-
-            Response response = client.AddClassification(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.AddClassification(content);
             Console.WriteLine(response.Status);
         }
 
@@ -1517,42 +1263,44 @@ public void Example_AddClassification()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddClassification_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                classification = new
+                ["classification"] = new Dictionary<string, object>()
                 {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-                    source = "<source>",
-                    sourceDetails = new
+                    ["entityGuid"] = "<entityGuid>",
+                    ["entityStatus"] = "ACTIVE",
+                    ["removePropagationsOnEntityDelete"] = true,
+                    ["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+                    ["source"] = "<source>",
+                    ["sourceDetails"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    attributes = new
+                    ["attributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
+                    ["typeName"] = "<typeName>",
+                    ["lastModifiedTS"] = "<lastModifiedTS>",
                 },
-                entityGuids = new[] {
-        "<String>"
-    },
-            };
-
-            Response response = client.AddClassification(RequestContent.Create(data));
+                ["entityGuids"] = new List<object>()
+{
+"<entityGuids>"
+},
+            });
+            Response response = client.AddClassification(content);
             Console.WriteLine(response.Status);
         }
 
@@ -1560,13 +1308,12 @@ public void Example_AddClassification_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddClassification_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.AddClassificationAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.AddClassificationAsync(content);
             Console.WriteLine(response.Status);
         }
 
@@ -1574,42 +1321,44 @@ public async Task Example_AddClassification_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddClassification_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                classification = new
+                ["classification"] = new Dictionary<string, object>()
                 {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-                    source = "<source>",
-                    sourceDetails = new
+                    ["entityGuid"] = "<entityGuid>",
+                    ["entityStatus"] = "ACTIVE",
+                    ["removePropagationsOnEntityDelete"] = true,
+                    ["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+                    ["source"] = "<source>",
+                    ["sourceDetails"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    attributes = new
+                    ["attributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
+                    ["typeName"] = "<typeName>",
+                    ["lastModifiedTS"] = "<lastModifiedTS>",
                 },
-                entityGuids = new[] {
-        "<String>"
-    },
-            };
-
-            Response response = await client.AddClassificationAsync(RequestContent.Create(data));
+                ["entityGuids"] = new List<object>()
+{
+"<entityGuids>"
+},
+            });
+            Response response = await client.AddClassificationAsync(content);
             Console.WriteLine(response.Status);
         }
 
@@ -1617,11 +1366,11 @@ public async Task Example_AddClassification_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetByGuid()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetByGuid("<guid>", true, true, new RequestContext());
+            Response response = client.GetByGuid("<guid>", null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1631,14 +1380,14 @@ public void Example_GetByGuid()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetByGuid_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetByGuid("<guid>", true, true, new RequestContext());
+            Response response = client.GetByGuid("<guid>", true, true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -1646,13 +1395,13 @@ public void Example_GetByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("createTime").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("homeId").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("isIncomplete").ToString());
@@ -1669,72 +1418,72 @@ public void Example_GetByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("entity").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("provenanceType").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("updateTime").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("updatedBy").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetByGuid_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetByGuidAsync("<guid>", true, true, new RequestContext());
+            Response response = await client.GetByGuidAsync("<guid>", null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1744,14 +1493,14 @@ public async Task Example_GetByGuid_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetByGuid_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetByGuidAsync("<guid>", true, true, new RequestContext());
+            Response response = await client.GetByGuidAsync("<guid>", true, true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -1759,13 +1508,13 @@ public async Task Example_GetByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("createTime").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("homeId").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("isIncomplete").ToString());
@@ -1782,74 +1531,73 @@ public async Task Example_GetByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entity").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("provenanceType").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("updateTime").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("updatedBy").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_PartialUpdateEntityAttributeByGuid()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new { };
-
-            Response response = client.PartialUpdateEntityAttributeByGuid("<guid>", "<name>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.PartialUpdateEntityAttributeByGuid("<guid>", "<name>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1859,47 +1607,46 @@ public void Example_PartialUpdateEntityAttributeByGuid()
         [Ignore("Only validating compilation of examples")]
         public void Example_PartialUpdateEntityAttributeByGuid_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.PartialUpdateEntityAttributeByGuid("<guid>", "<name>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.PartialUpdateEntityAttributeByGuid("<guid>", "<name>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -1908,8 +1655,8 @@ public void Example_PartialUpdateEntityAttributeByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -1928,7 +1675,7 @@ public void Example_PartialUpdateEntityAttributeByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -1937,13 +1684,12 @@ public void Example_PartialUpdateEntityAttributeByGuid_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_PartialUpdateEntityAttributeByGuid_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new { };
-
-            Response response = await client.PartialUpdateEntityAttributeByGuidAsync("<guid>", "<name>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.PartialUpdateEntityAttributeByGuidAsync("<guid>", "<name>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1953,47 +1699,46 @@ public async Task Example_PartialUpdateEntityAttributeByGuid_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_PartialUpdateEntityAttributeByGuid_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.PartialUpdateEntityAttributeByGuidAsync("<guid>", "<name>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.PartialUpdateEntityAttributeByGuidAsync("<guid>", "<name>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -2002,8 +1747,8 @@ public async Task Example_PartialUpdateEntityAttributeByGuid_AllParameters_Async
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -2022,7 +1767,7 @@ public async Task Example_PartialUpdateEntityAttributeByGuid_AllParameters_Async
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -2031,11 +1776,11 @@ public async Task Example_PartialUpdateEntityAttributeByGuid_AllParameters_Async
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteByGuid()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.DeleteByGuid("<guid>", new RequestContext());
+            Response response = client.DeleteByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2045,45 +1790,45 @@ public void Example_DeleteByGuid()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteByGuid_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.DeleteByGuid("<guid>", new RequestContext());
+            Response response = client.DeleteByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -2092,8 +1837,8 @@ public void Example_DeleteByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -2112,7 +1857,7 @@ public void Example_DeleteByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -2121,11 +1866,11 @@ public void Example_DeleteByGuid_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteByGuid_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.DeleteByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.DeleteByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2135,45 +1880,45 @@ public async Task Example_DeleteByGuid_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteByGuid_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.DeleteByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.DeleteByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -2182,8 +1927,8 @@ public async Task Example_DeleteByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -2202,7 +1947,7 @@ public async Task Example_DeleteByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -2211,11 +1956,11 @@ public async Task Example_DeleteByGuid_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetClassification()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetClassification("<guid>", "<classificationName>", new RequestContext());
+            Response response = client.GetClassification("<guid>", "<classificationName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2225,11 +1970,11 @@ public void Example_GetClassification()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetClassification_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetClassification("<guid>", "<classificationName>", new RequestContext());
+            Response response = client.GetClassification("<guid>", "<classificationName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("entityGuid").ToString());
@@ -2239,8 +1984,8 @@ public void Example_GetClassification_AllParameters()
             Console.WriteLine(result.GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
         }
@@ -2249,11 +1994,11 @@ public void Example_GetClassification_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetClassification_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetClassificationAsync("<guid>", "<classificationName>", new RequestContext());
+            Response response = await client.GetClassificationAsync("<guid>", "<classificationName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2263,11 +2008,11 @@ public async Task Example_GetClassification_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetClassification_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetClassificationAsync("<guid>", "<classificationName>", new RequestContext());
+            Response response = await client.GetClassificationAsync("<guid>", "<classificationName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("entityGuid").ToString());
@@ -2277,8 +2022,8 @@ public async Task Example_GetClassification_AllParameters_Async()
             Console.WriteLine(result.GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
         }
@@ -2287,9 +2032,9 @@ public async Task Example_GetClassification_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteClassification()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
             Response response = client.DeleteClassification("<guid>", "<classificationName>");
             Console.WriteLine(response.Status);
@@ -2299,9 +2044,9 @@ public void Example_DeleteClassification()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteClassification_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
             Response response = client.DeleteClassification("<guid>", "<classificationName>");
             Console.WriteLine(response.Status);
@@ -2311,9 +2056,9 @@ public void Example_DeleteClassification_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteClassification_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
             Response response = await client.DeleteClassificationAsync("<guid>", "<classificationName>");
             Console.WriteLine(response.Status);
@@ -2323,9 +2068,9 @@ public async Task Example_DeleteClassification_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteClassification_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
             Response response = await client.DeleteClassificationAsync("<guid>", "<classificationName>");
             Console.WriteLine(response.Status);
@@ -2335,11 +2080,11 @@ public async Task Example_DeleteClassification_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetClassifications()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetClassifications("<guid>", new RequestContext());
+            Response response = client.GetClassifications("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2349,11 +2094,11 @@ public void Example_GetClassifications()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetClassifications_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetClassifications("<guid>", new RequestContext());
+            Response response = client.GetClassifications("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("list")[0].ToString());
@@ -2368,11 +2113,11 @@ public void Example_GetClassifications_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetClassifications_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetClassificationsAsync("<guid>", new RequestContext());
+            Response response = await client.GetClassificationsAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2382,11 +2127,11 @@ public async Task Example_GetClassifications_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetClassifications_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetClassificationsAsync("<guid>", new RequestContext());
+            Response response = await client.GetClassificationsAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("list")[0].ToString());
@@ -2401,15 +2146,15 @@ public async Task Example_GetClassifications_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddClassifications()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    new {}
-};
-
-            Response response = client.AddClassifications("<guid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = client.AddClassifications("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -2417,35 +2162,40 @@ public void Example_AddClassifications()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddClassifications_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.AddClassifications("<guid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+            Response response = client.AddClassifications("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -2453,15 +2203,15 @@ public void Example_AddClassifications_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddClassifications_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    new {}
-};
-
-            Response response = await client.AddClassificationsAsync("<guid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = await client.AddClassificationsAsync("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -2469,35 +2219,40 @@ public async Task Example_AddClassifications_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddClassifications_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.AddClassificationsAsync("<guid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+            Response response = await client.AddClassificationsAsync("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -2505,15 +2260,15 @@ public async Task Example_AddClassifications_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateClassifications()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    new {}
-};
-
-            Response response = client.UpdateClassifications("<guid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = client.UpdateClassifications("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -2521,35 +2276,40 @@ public void Example_UpdateClassifications()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateClassifications_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.UpdateClassifications("<guid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+            Response response = client.UpdateClassifications("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -2557,15 +2317,15 @@ public void Example_UpdateClassifications_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateClassifications_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    new {}
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.UpdateClassificationsAsync("<guid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = await client.UpdateClassificationsAsync("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -2573,35 +2333,40 @@ public async Task Example_UpdateClassifications_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateClassifications_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.UpdateClassificationsAsync("<guid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+            Response response = await client.UpdateClassificationsAsync("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -2609,11 +2374,11 @@ public async Task Example_UpdateClassifications_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetByUniqueAttributes()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetByUniqueAttributes("<typeName>", true, true, "<attrQualifiedName>", new RequestContext());
+            Response response = client.GetByUniqueAttributes("<typeName>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2623,14 +2388,14 @@ public void Example_GetByUniqueAttributes()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetByUniqueAttributes_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetByUniqueAttributes("<typeName>", true, true, "<attrQualifiedName>", new RequestContext());
+            Response response = client.GetByUniqueAttributes("<typeName>", true, true, "<attrQualifiedName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -2638,13 +2403,13 @@ public void Example_GetByUniqueAttributes_AllParameters()
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("createTime").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("homeId").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("isIncomplete").ToString());
@@ -2661,72 +2426,72 @@ public void Example_GetByUniqueAttributes_AllParameters()
             Console.WriteLine(result.GetProperty("entity").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("provenanceType").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("updateTime").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("updatedBy").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetByUniqueAttributes_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetByUniqueAttributesAsync("<typeName>", true, true, "<attrQualifiedName>", new RequestContext());
+            Response response = await client.GetByUniqueAttributesAsync("<typeName>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2736,14 +2501,14 @@ public async Task Example_GetByUniqueAttributes_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetByUniqueAttributes_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetByUniqueAttributesAsync("<typeName>", true, true, "<attrQualifiedName>", new RequestContext());
+            Response response = await client.GetByUniqueAttributesAsync("<typeName>", true, true, "<attrQualifiedName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("businessAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -2751,13 +2516,13 @@ public async Task Example_GetByUniqueAttributes_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("createTime").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("customAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("homeId").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("isIncomplete").ToString());
@@ -2774,74 +2539,73 @@ public async Task Example_GetByUniqueAttributes_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entity").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("provenanceType").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("updateTime").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("updatedBy").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("entity").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entity").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_PartialUpdateEntityByUniqueAttributes()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.PartialUpdateEntityByUniqueAttributes("<typeName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.PartialUpdateEntityByUniqueAttributes("<typeName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2851,224 +2615,150 @@ public void Example_PartialUpdateEntityByUniqueAttributes()
         [Ignore("Only validating compilation of examples")]
         public void Example_PartialUpdateEntityByUniqueAttributes_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                entity = new
+                ["entity"] = new Dictionary<string, object>()
                 {
-                    businessAttributes = new
+                    ["businessAttributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-                    createTime = 123.45f,
-                    createdBy = "<createdBy>",
-                    customAttributes = new
+                    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                    ["createTime"] = 123.45F,
+                    ["createdBy"] = "<createdBy>",
+                    ["customAttributes"] = new Dictionary<string, object>()
                     {
-                        key = "<String>",
+                        ["key"] = "<customAttributes>",
                     },
-                    guid = "<guid>",
-                    homeId = "<homeId>",
-                    isIncomplete = true,
-                    labels = new[] {
-            "<String>"
-        },
-                    meanings = new[] {
-            new {
-                confidence = 1234,
-                createdBy = "<createdBy>",
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DISCOVERED",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-                    provenanceType = 123.45f,
-                    proxy = true,
-                    relationshipAttributes = new
+                    ["guid"] = "<guid>",
+                    ["homeId"] = "<homeId>",
+                    ["isIncomplete"] = true,
+                    ["labels"] = new List<object>()
+{
+"<labels>"
+},
+                    ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                    ["provenanceType"] = 123.45F,
+                    ["proxy"] = true,
+                    ["relationshipAttributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    status = "ACTIVE",
-                    updateTime = 123.45f,
-                    updatedBy = "<updatedBy>",
-                    version = 123.45f,
-                    source = "<source>",
-                    sourceDetails = new
+                    ["status"] = "ACTIVE",
+                    ["updateTime"] = 123.45F,
+                    ["updatedBy"] = "<updatedBy>",
+                    ["version"] = 123.45F,
+                    ["source"] = "<source>",
+                    ["sourceDetails"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    contacts = new
+                    ["contacts"] = new Dictionary<string, object>()
                     {
-                        key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
+                        ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
                     },
-                    attributes = new
+                    ["attributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
+                    ["typeName"] = "<typeName>",
+                    ["lastModifiedTS"] = "<lastModifiedTS>",
                 },
-                referredEntities = new
+                ["referredEntities"] = new Dictionary<string, object>()
                 {
-                    key = new
-                    {
-                        businessAttributes = new
-                        {
-                            key = new { },
-                        },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        createTime = 123.45f,
-                        createdBy = "<createdBy>",
-                        customAttributes = new
-                        {
-                            key = "<String>",
-                        },
-                        guid = "<guid>",
-                        homeId = "<homeId>",
-                        isIncomplete = true,
-                        labels = new[] {
-                "<String>"
-            },
-                        meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        provenanceType = 123.45f,
-                        proxy = true,
-                        relationshipAttributes = new
-                        {
-                            key = new { },
-                        },
-                        status = "ACTIVE",
-                        updateTime = 123.45f,
-                        updatedBy = "<updatedBy>",
-                        version = 123.45f,
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        contacts = new
-                        {
-                            key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
+                    ["key"] = null
+            ,
                 },
-            };
-
-            Response response = client.PartialUpdateEntityByUniqueAttributes("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+            });
+            Response response = client.PartialUpdateEntityByUniqueAttributes("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -3077,8 +2767,8 @@ public void Example_PartialUpdateEntityByUniqueAttributes_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -3097,7 +2787,7 @@ public void Example_PartialUpdateEntityByUniqueAttributes_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -3106,13 +2796,12 @@ public void Example_PartialUpdateEntityByUniqueAttributes_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_PartialUpdateEntityByUniqueAttributes_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new { };
-
-            Response response = await client.PartialUpdateEntityByUniqueAttributesAsync("<typeName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.PartialUpdateEntityByUniqueAttributesAsync("<typeName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -3122,224 +2811,150 @@ public async Task Example_PartialUpdateEntityByUniqueAttributes_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_PartialUpdateEntityByUniqueAttributes_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                entity = new
+                ["entity"] = new Dictionary<string, object>()
                 {
-                    businessAttributes = new
+                    ["businessAttributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-                    createTime = 123.45f,
-                    createdBy = "<createdBy>",
-                    customAttributes = new
+                    ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                    ["createTime"] = 123.45F,
+                    ["createdBy"] = "<createdBy>",
+                    ["customAttributes"] = new Dictionary<string, object>()
                     {
-                        key = "<String>",
+                        ["key"] = "<customAttributes>",
                     },
-                    guid = "<guid>",
-                    homeId = "<homeId>",
-                    isIncomplete = true,
-                    labels = new[] {
-            "<String>"
-        },
-                    meanings = new[] {
-            new {
-                confidence = 1234,
-                createdBy = "<createdBy>",
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DISCOVERED",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-                    provenanceType = 123.45f,
-                    proxy = true,
-                    relationshipAttributes = new
+                    ["guid"] = "<guid>",
+                    ["homeId"] = "<homeId>",
+                    ["isIncomplete"] = true,
+                    ["labels"] = new List<object>()
+{
+"<labels>"
+},
+                    ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                    ["provenanceType"] = 123.45F,
+                    ["proxy"] = true,
+                    ["relationshipAttributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    status = "ACTIVE",
-                    updateTime = 123.45f,
-                    updatedBy = "<updatedBy>",
-                    version = 123.45f,
-                    source = "<source>",
-                    sourceDetails = new
+                    ["status"] = "ACTIVE",
+                    ["updateTime"] = 123.45F,
+                    ["updatedBy"] = "<updatedBy>",
+                    ["version"] = 123.45F,
+                    ["source"] = "<source>",
+                    ["sourceDetails"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    contacts = new
+                    ["contacts"] = new Dictionary<string, object>()
                     {
-                        key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
+                        ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
                     },
-                    attributes = new
+                    ["attributes"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
+                    ["typeName"] = "<typeName>",
+                    ["lastModifiedTS"] = "<lastModifiedTS>",
                 },
-                referredEntities = new
+                ["referredEntities"] = new Dictionary<string, object>()
                 {
-                    key = new
-                    {
-                        businessAttributes = new
-                        {
-                            key = new { },
-                        },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        createTime = 123.45f,
-                        createdBy = "<createdBy>",
-                        customAttributes = new
-                        {
-                            key = "<String>",
-                        },
-                        guid = "<guid>",
-                        homeId = "<homeId>",
-                        isIncomplete = true,
-                        labels = new[] {
-                "<String>"
-            },
-                        meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        provenanceType = 123.45f,
-                        proxy = true,
-                        relationshipAttributes = new
-                        {
-                            key = new { },
-                        },
-                        status = "ACTIVE",
-                        updateTime = 123.45f,
-                        updatedBy = "<updatedBy>",
-                        version = 123.45f,
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        contacts = new
-                        {
-                            key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
+                    ["key"] = null
+            ,
                 },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                },
-            };
-
-            Response response = await client.PartialUpdateEntityByUniqueAttributesAsync("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+            });
+            Response response = await client.PartialUpdateEntityByUniqueAttributesAsync("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -3348,8 +2963,8 @@ public async Task Example_PartialUpdateEntityByUniqueAttributes_AllParameters_As
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -3368,7 +2983,7 @@ public async Task Example_PartialUpdateEntityByUniqueAttributes_AllParameters_As
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -3377,11 +2992,11 @@ public async Task Example_PartialUpdateEntityByUniqueAttributes_AllParameters_As
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteByUniqueAttribute()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.DeleteByUniqueAttribute("<typeName>", "<attrQualifiedName>", new RequestContext());
+            Response response = client.DeleteByUniqueAttribute("<typeName>", null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -3391,45 +3006,45 @@ public void Example_DeleteByUniqueAttribute()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteByUniqueAttribute_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.DeleteByUniqueAttribute("<typeName>", "<attrQualifiedName>", new RequestContext());
+            Response response = client.DeleteByUniqueAttribute("<typeName>", "<attrQualifiedName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -3438,8 +3053,8 @@ public void Example_DeleteByUniqueAttribute_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -3458,7 +3073,7 @@ public void Example_DeleteByUniqueAttribute_AllParameters()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -3467,11 +3082,11 @@ public void Example_DeleteByUniqueAttribute_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteByUniqueAttribute_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.DeleteByUniqueAttributeAsync("<typeName>", "<attrQualifiedName>", new RequestContext());
+            Response response = await client.DeleteByUniqueAttributeAsync("<typeName>", null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -3481,45 +3096,45 @@ public async Task Example_DeleteByUniqueAttribute_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteByUniqueAttribute_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.DeleteByUniqueAttributeAsync("<typeName>", "<attrQualifiedName>", new RequestContext());
+            Response response = await client.DeleteByUniqueAttributeAsync("<typeName>", "<attrQualifiedName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<test>")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidAssignments").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("mutatedEntities").GetProperty("<key>")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classificationNames")[0].ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
@@ -3528,8 +3143,8 @@ public async Task Example_DeleteByUniqueAttribute_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("displayText").ToString());
@@ -3548,7 +3163,7 @@ public async Task Example_DeleteByUniqueAttribute_AllParameters_Async()
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("partialUpdatedEntities")[0].GetProperty("lastModifiedTS").ToString());
         }
@@ -3557,9 +3172,9 @@ public async Task Example_DeleteByUniqueAttribute_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteClassificationByUniqueAttribute()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
             Response response = client.DeleteClassificationByUniqueAttribute("<typeName>", "<classificationName>");
             Console.WriteLine(response.Status);
@@ -3569,11 +3184,11 @@ public void Example_DeleteClassificationByUniqueAttribute()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteClassificationByUniqueAttribute_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.DeleteClassificationByUniqueAttribute("<typeName>", "<classificationName>", "<attrQualifiedName>");
+            Response response = client.DeleteClassificationByUniqueAttribute("<typeName>", "<classificationName>", attrQualifiedName: "<attrQualifiedName>");
             Console.WriteLine(response.Status);
         }
 
@@ -3581,9 +3196,9 @@ public void Example_DeleteClassificationByUniqueAttribute_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteClassificationByUniqueAttribute_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
             Response response = await client.DeleteClassificationByUniqueAttributeAsync("<typeName>", "<classificationName>");
             Console.WriteLine(response.Status);
@@ -3593,11 +3208,11 @@ public async Task Example_DeleteClassificationByUniqueAttribute_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteClassificationByUniqueAttribute_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.DeleteClassificationByUniqueAttributeAsync("<typeName>", "<classificationName>", "<attrQualifiedName>");
+            Response response = await client.DeleteClassificationByUniqueAttributeAsync("<typeName>", "<classificationName>", attrQualifiedName: "<attrQualifiedName>");
             Console.WriteLine(response.Status);
         }
 
@@ -3605,15 +3220,15 @@ public async Task Example_DeleteClassificationByUniqueAttribute_AllParameters_As
         [Ignore("Only validating compilation of examples")]
         public void Example_AddClassificationsByUniqueAttribute()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    new {}
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.AddClassificationsByUniqueAttribute("<typeName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = client.AddClassificationsByUniqueAttribute("<typeName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -3621,35 +3236,40 @@ public void Example_AddClassificationsByUniqueAttribute()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddClassificationsByUniqueAttribute_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.AddClassificationsByUniqueAttribute("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+            Response response = client.AddClassificationsByUniqueAttribute("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
             Console.WriteLine(response.Status);
         }
 
@@ -3657,15 +3277,15 @@ public void Example_AddClassificationsByUniqueAttribute_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddClassificationsByUniqueAttribute_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    new {}
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.AddClassificationsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = await client.AddClassificationsByUniqueAttributeAsync("<typeName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -3673,35 +3293,40 @@ public async Task Example_AddClassificationsByUniqueAttribute_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddClassificationsByUniqueAttribute_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.AddClassificationsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+            Response response = await client.AddClassificationsByUniqueAttributeAsync("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
             Console.WriteLine(response.Status);
         }
 
@@ -3709,15 +3334,15 @@ public async Task Example_AddClassificationsByUniqueAttribute_AllParameters_Asyn
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateClassificationsByUniqueAttribute()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    new {}
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.UpdateClassificationsByUniqueAttribute("<typeName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = client.UpdateClassificationsByUniqueAttribute("<typeName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -3725,35 +3350,40 @@ public void Example_UpdateClassificationsByUniqueAttribute()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateClassificationsByUniqueAttribute_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.UpdateClassificationsByUniqueAttribute("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+            Response response = client.UpdateClassificationsByUniqueAttribute("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
             Console.WriteLine(response.Status);
         }
 
@@ -3761,15 +3391,15 @@ public void Example_UpdateClassificationsByUniqueAttribute_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateClassificationsByUniqueAttribute_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    new {}
-};
-
-            Response response = await client.UpdateClassificationsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = await client.UpdateClassificationsByUniqueAttributeAsync("<typeName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -3777,35 +3407,40 @@ public async Task Example_UpdateClassificationsByUniqueAttribute_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateClassificationsByUniqueAttribute_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    new {
-        entityGuid = "<entityGuid>",
-        entityStatus = "ACTIVE",
-        removePropagationsOnEntityDelete = true,
-        validityPeriods = new[] {
-            new {
-                endTime = "<endTime>",
-                startTime = "<startTime>",
-                timeZone = "<timeZone>",
-            }
-        },
-        source = "<source>",
-        sourceDetails = new {
-            key = new {},
-        },
-        attributes = new {
-            key = new {},
-        },
-        typeName = "<typeName>",
-        lastModifiedTS = "<lastModifiedTS>",
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.UpdateClassificationsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+});
+            Response response = await client.UpdateClassificationsByUniqueAttributeAsync("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
             Console.WriteLine(response.Status);
         }
 
@@ -3813,13 +3448,12 @@ public async Task Example_UpdateClassificationsByUniqueAttribute_AllParameters_A
         [Ignore("Only validating compilation of examples")]
         public void Example_SetClassifications()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new { };
-
-            Response response = client.SetClassifications(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.SetClassifications(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -3829,77 +3463,87 @@ public void Example_SetClassifications()
         [Ignore("Only validating compilation of examples")]
         public void Example_SetClassifications_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                guidHeaderMap = new
+                ["guidHeaderMap"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        classificationNames = new[] {
-                "<String>"
-            },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        displayText = "<displayText>",
-                        guid = "<guid>",
-                        isIncomplete = true,
-                        labels = new[] {
-                "<String>"
-            },
-                        meaningNames = new[] {
-                "<String>"
-            },
-                        meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        status = "ACTIVE",
-                        attributes = new
+                        ["classificationNames"] = new List<object>()
+{
+"<classificationNames>"
+},
+                        ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                        ["displayText"] = "<displayText>",
+                        ["guid"] = "<guid>",
+                        ["isIncomplete"] = true,
+                        ["labels"] = new List<object>()
+{
+"<labels>"
+},
+                        ["meaningNames"] = new List<object>()
+{
+"<meaningNames>"
+},
+                        ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                        ["status"] = "ACTIVE",
+                        ["attributes"] = new Dictionary<string, object>()
                         {
-                            key = new { },
+                            ["key"] = new Dictionary<string, object>(),
                         },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
+                        ["typeName"] = "<typeName>",
+                        ["lastModifiedTS"] = "<lastModifiedTS>",
                     },
                 },
-            };
-
-            Response response = client.SetClassifications(RequestContent.Create(data));
+            });
+            Response response = client.SetClassifications(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -3909,13 +3553,12 @@ public void Example_SetClassifications_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SetClassifications_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.SetClassificationsAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.SetClassificationsAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -3925,77 +3568,87 @@ public async Task Example_SetClassifications_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SetClassifications_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                guidHeaderMap = new
+                ["guidHeaderMap"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        classificationNames = new[] {
-                "<String>"
-            },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        displayText = "<displayText>",
-                        guid = "<guid>",
-                        isIncomplete = true,
-                        labels = new[] {
-                "<String>"
-            },
-                        meaningNames = new[] {
-                "<String>"
-            },
-                        meanings = new[] {
-                new {
-                    confidence = 1234,
-                    createdBy = "<createdBy>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DISCOVERED",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        status = "ACTIVE",
-                        attributes = new
+                        ["classificationNames"] = new List<object>()
+{
+"<classificationNames>"
+},
+                        ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                        ["displayText"] = "<displayText>",
+                        ["guid"] = "<guid>",
+                        ["isIncomplete"] = true,
+                        ["labels"] = new List<object>()
+{
+"<labels>"
+},
+                        ["meaningNames"] = new List<object>()
+{
+"<meaningNames>"
+},
+                        ["meanings"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["confidence"] = 1234,
+["createdBy"] = "<createdBy>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DISCOVERED",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                        ["status"] = "ACTIVE",
+                        ["attributes"] = new Dictionary<string, object>()
                         {
-                            key = new { },
+                            ["key"] = new Dictionary<string, object>(),
                         },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
+                        ["typeName"] = "<typeName>",
+                        ["lastModifiedTS"] = "<lastModifiedTS>",
                     },
                 },
-            };
-
-            Response response = await client.SetClassificationsAsync(RequestContent.Create(data));
+            });
+            Response response = await client.SetClassificationsAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -4005,11 +3658,11 @@ public async Task Example_SetClassifications_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEntitiesByUniqueAttributes()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetEntitiesByUniqueAttributes("<typeName>", true, true, "<attrNQualifiedName>", new RequestContext());
+            Response response = client.GetEntitiesByUniqueAttributes("<typeName>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -4019,14 +3672,14 @@ public void Example_GetEntitiesByUniqueAttributes()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEntitiesByUniqueAttributes_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetEntitiesByUniqueAttributes("<typeName>", true, true, "<attrNQualifiedName>", new RequestContext());
+            Response response = client.GetEntitiesByUniqueAttributes("<typeName>", true, true, "<attrNQualifiedName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -4034,13 +3687,13 @@ public void Example_GetEntitiesByUniqueAttributes_AllParameters()
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createTime").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("homeId").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("isIncomplete").ToString());
@@ -4057,72 +3710,72 @@ public void Example_GetEntitiesByUniqueAttributes_AllParameters()
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("provenanceType").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updateTime").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updatedBy").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEntitiesByUniqueAttributes_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetEntitiesByUniqueAttributesAsync("<typeName>", true, true, "<attrNQualifiedName>", new RequestContext());
+            Response response = await client.GetEntitiesByUniqueAttributesAsync("<typeName>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -4132,14 +3785,14 @@ public async Task Example_GetEntitiesByUniqueAttributes_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEntitiesByUniqueAttributes_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetEntitiesByUniqueAttributesAsync("<typeName>", true, true, "<attrNQualifiedName>", new RequestContext());
+            Response response = await client.GetEntitiesByUniqueAttributesAsync("<typeName>", true, true, "<attrNQualifiedName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("businessAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
@@ -4147,13 +3800,13 @@ public async Task Example_GetEntitiesByUniqueAttributes_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createTime").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("customAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("homeId").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("isIncomplete").ToString());
@@ -4170,72 +3823,72 @@ public async Task Example_GetEntitiesByUniqueAttributes_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("provenanceType").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updateTime").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("updatedBy").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("entities")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entities")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("businessAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("customAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("homeId").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("provenanceType").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("proxy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("relationshipAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updateTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("updatedBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("businessAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("customAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("homeId").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("provenanceType").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("proxy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("relationshipAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updateTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("updatedBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("version").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetHeader()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetHeader("<guid>", new RequestContext());
+            Response response = client.GetHeader("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -4245,11 +3898,11 @@ public void Example_GetHeader()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetHeader_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetHeader("<guid>", new RequestContext());
+            Response response = client.GetHeader("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("classificationNames")[0].ToString());
@@ -4260,8 +3913,8 @@ public void Example_GetHeader_AllParameters()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("displayText").ToString());
@@ -4280,7 +3933,7 @@ public void Example_GetHeader_AllParameters()
             Console.WriteLine(result.GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
         }
@@ -4289,11 +3942,11 @@ public void Example_GetHeader_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetHeader_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetHeaderAsync("<guid>", new RequestContext());
+            Response response = await client.GetHeaderAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -4303,11 +3956,11 @@ public async Task Example_GetHeader_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetHeader_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetHeaderAsync("<guid>", new RequestContext());
+            Response response = await client.GetHeaderAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("classificationNames")[0].ToString());
@@ -4318,8 +3971,8 @@ public async Task Example_GetHeader_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("displayText").ToString());
@@ -4338,7 +3991,7 @@ public async Task Example_GetHeader_AllParameters_Async()
             Console.WriteLine(result.GetProperty("meanings")[0].GetProperty("steward").ToString());
             Console.WriteLine(result.GetProperty("meanings")[0].GetProperty("termGuid").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
         }
@@ -4347,16 +4000,12 @@ public async Task Example_GetHeader_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteBusinessMetadata()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new
-            {
-                key = new { },
-            };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.DeleteBusinessMetadata("<guid>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.DeleteBusinessMetadata("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4364,16 +4013,15 @@ public void Example_DeleteBusinessMetadata()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteBusinessMetadata_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = new { },
-            };
-
-            Response response = client.DeleteBusinessMetadata("<guid>", RequestContent.Create(data));
+                ["key"] = new Dictionary<string, object>(),
+            });
+            Response response = client.DeleteBusinessMetadata("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4381,16 +4029,12 @@ public void Example_DeleteBusinessMetadata_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteBusinessMetadata_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new
-            {
-                key = new { },
-            };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.DeleteBusinessMetadataAsync("<guid>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.DeleteBusinessMetadataAsync("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4398,16 +4042,15 @@ public async Task Example_DeleteBusinessMetadata_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteBusinessMetadata_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = new { },
-            };
-
-            Response response = await client.DeleteBusinessMetadataAsync("<guid>", RequestContent.Create(data));
+                ["key"] = new Dictionary<string, object>(),
+            });
+            Response response = await client.DeleteBusinessMetadataAsync("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4415,16 +4058,12 @@ public async Task Example_DeleteBusinessMetadata_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddOrUpdateBusinessMetadata()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new
-            {
-                key = new { },
-            };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.AddOrUpdateBusinessMetadata("<guid>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.AddOrUpdateBusinessMetadata("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4432,16 +4071,15 @@ public void Example_AddOrUpdateBusinessMetadata()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddOrUpdateBusinessMetadata_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = new { },
-            };
-
-            Response response = client.AddOrUpdateBusinessMetadata("<guid>", RequestContent.Create(data), true);
+                ["key"] = new Dictionary<string, object>(),
+            });
+            Response response = client.AddOrUpdateBusinessMetadata("<guid>", content, isOverwrite: true);
             Console.WriteLine(response.Status);
         }
 
@@ -4449,16 +4087,12 @@ public void Example_AddOrUpdateBusinessMetadata_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddOrUpdateBusinessMetadata_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
-            {
-                key = new { },
-            };
-
-            Response response = await client.AddOrUpdateBusinessMetadataAsync("<guid>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.AddOrUpdateBusinessMetadataAsync("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4466,16 +4100,15 @@ public async Task Example_AddOrUpdateBusinessMetadata_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddOrUpdateBusinessMetadata_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = new { },
-            };
-
-            Response response = await client.AddOrUpdateBusinessMetadataAsync("<guid>", RequestContent.Create(data), true);
+                ["key"] = new Dictionary<string, object>(),
+            });
+            Response response = await client.AddOrUpdateBusinessMetadataAsync("<guid>", content, isOverwrite: true);
             Console.WriteLine(response.Status);
         }
 
@@ -4483,16 +4116,12 @@ public async Task Example_AddOrUpdateBusinessMetadata_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteBusinessMetadataAttributes()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new
-            {
-                key = new { },
-            };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.DeleteBusinessMetadataAttributes("<guid>", "<bmName>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.DeleteBusinessMetadataAttributes("<guid>", "<bmName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4500,16 +4129,15 @@ public void Example_DeleteBusinessMetadataAttributes()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteBusinessMetadataAttributes_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = new { },
-            };
-
-            Response response = client.DeleteBusinessMetadataAttributes("<guid>", "<bmName>", RequestContent.Create(data));
+                ["key"] = new Dictionary<string, object>(),
+            });
+            Response response = client.DeleteBusinessMetadataAttributes("<guid>", "<bmName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4517,16 +4145,12 @@ public void Example_DeleteBusinessMetadataAttributes_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteBusinessMetadataAttributes_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new
-            {
-                key = new { },
-            };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.DeleteBusinessMetadataAttributesAsync("<guid>", "<bmName>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.DeleteBusinessMetadataAttributesAsync("<guid>", "<bmName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4534,16 +4158,15 @@ public async Task Example_DeleteBusinessMetadataAttributes_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteBusinessMetadataAttributes_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = new { },
-            };
-
-            Response response = await client.DeleteBusinessMetadataAttributesAsync("<guid>", "<bmName>", RequestContent.Create(data));
+                ["key"] = new Dictionary<string, object>(),
+            });
+            Response response = await client.DeleteBusinessMetadataAttributesAsync("<guid>", "<bmName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4551,16 +4174,12 @@ public async Task Example_DeleteBusinessMetadataAttributes_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddOrUpdateBusinessMetadataAttributes()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new
-            {
-                key = new { },
-            };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.AddOrUpdateBusinessMetadataAttributes("<guid>", "<bmName>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.AddOrUpdateBusinessMetadataAttributes("<guid>", "<bmName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4568,16 +4187,15 @@ public void Example_AddOrUpdateBusinessMetadataAttributes()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddOrUpdateBusinessMetadataAttributes_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = new { },
-            };
-
-            Response response = client.AddOrUpdateBusinessMetadataAttributes("<guid>", "<bmName>", RequestContent.Create(data));
+                ["key"] = new Dictionary<string, object>(),
+            });
+            Response response = client.AddOrUpdateBusinessMetadataAttributes("<guid>", "<bmName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4585,16 +4203,12 @@ public void Example_AddOrUpdateBusinessMetadataAttributes_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddOrUpdateBusinessMetadataAttributes_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
-            {
-                key = new { },
-            };
-
-            Response response = await client.AddOrUpdateBusinessMetadataAttributesAsync("<guid>", "<bmName>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.AddOrUpdateBusinessMetadataAttributesAsync("<guid>", "<bmName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4602,16 +4216,15 @@ public async Task Example_AddOrUpdateBusinessMetadataAttributes_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddOrUpdateBusinessMetadataAttributes_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = new { },
-            };
-
-            Response response = await client.AddOrUpdateBusinessMetadataAttributesAsync("<guid>", "<bmName>", RequestContent.Create(data));
+                ["key"] = new Dictionary<string, object>(),
+            });
+            Response response = await client.AddOrUpdateBusinessMetadataAttributesAsync("<guid>", "<bmName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4619,14 +4232,14 @@ public async Task Example_AddOrUpdateBusinessMetadataAttributes_AllParameters_As
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSampleBusinessMetadataTemplate()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetSampleBusinessMetadataTemplate(new RequestContext());
+            Response response = client.GetSampleBusinessMetadataTemplate(null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -4637,14 +4250,14 @@ public void Example_GetSampleBusinessMetadataTemplate()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSampleBusinessMetadataTemplate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.GetSampleBusinessMetadataTemplate(new RequestContext());
+            Response response = client.GetSampleBusinessMetadataTemplate(null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -4655,14 +4268,14 @@ public void Example_GetSampleBusinessMetadataTemplate_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSampleBusinessMetadataTemplate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetSampleBusinessMetadataTemplateAsync(new RequestContext());
+            Response response = await client.GetSampleBusinessMetadataTemplateAsync(null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -4673,14 +4286,14 @@ public async Task Example_GetSampleBusinessMetadataTemplate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSampleBusinessMetadataTemplate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.GetSampleBusinessMetadataTemplateAsync(new RequestContext());
+            Response response = await client.GetSampleBusinessMetadataTemplateAsync(null);
             if (response.ContentStream != null)
             {
-                using (Stream outFileStream = File.OpenWrite("<filePath>"))
+                using (Stream outFileStream = File.OpenWrite("<filepath>"))
                 {
                     response.ContentStream.CopyTo(outFileStream);
                 }
@@ -4691,13 +4304,12 @@ public async Task Example_GetSampleBusinessMetadataTemplate_AllParameters_Async(
         [Ignore("Only validating compilation of examples")]
         public void Example_ImportBusinessMetadata()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = File.OpenRead("<filePath>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.ImportBusinessMetadata(RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.ImportBusinessMetadata(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -4707,13 +4319,12 @@ public void Example_ImportBusinessMetadata()
         [Ignore("Only validating compilation of examples")]
         public void Example_ImportBusinessMetadata_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = File.OpenRead("<filePath>");
-
-            Response response = client.ImportBusinessMetadata(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = client.ImportBusinessMetadata(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("failedImportInfoList")[0].GetProperty("childObjectName").ToString());
@@ -4730,13 +4341,12 @@ public void Example_ImportBusinessMetadata_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ImportBusinessMetadata_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = File.OpenRead("<filePath>");
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.ImportBusinessMetadataAsync(RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.ImportBusinessMetadataAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -4746,13 +4356,12 @@ public async Task Example_ImportBusinessMetadata_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ImportBusinessMetadata_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = File.OpenRead("<filePath>");
-
-            Response response = await client.ImportBusinessMetadataAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = await client.ImportBusinessMetadataAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("failedImportInfoList")[0].GetProperty("childObjectName").ToString());
@@ -4769,15 +4378,12 @@ public async Task Example_ImportBusinessMetadata_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteLabels()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    "<String>"
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.DeleteLabels("<guid>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.DeleteLabels("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4785,15 +4391,15 @@ public void Example_DeleteLabels()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteLabels_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = client.DeleteLabels("<guid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+            Response response = client.DeleteLabels("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4801,15 +4407,12 @@ public void Example_DeleteLabels_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteLabels_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = await client.DeleteLabelsAsync("<guid>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.DeleteLabelsAsync("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4817,15 +4420,15 @@ public async Task Example_DeleteLabels_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteLabels_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    "<String>"
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.DeleteLabelsAsync("<guid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+            Response response = await client.DeleteLabelsAsync("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4833,15 +4436,12 @@ public async Task Example_DeleteLabels_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_SetLabels()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    "<String>"
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.SetLabels("<guid>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.SetLabels("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4849,15 +4449,15 @@ public void Example_SetLabels()
         [Ignore("Only validating compilation of examples")]
         public void Example_SetLabels_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = client.SetLabels("<guid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+            Response response = client.SetLabels("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4865,15 +4465,12 @@ public void Example_SetLabels_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SetLabels_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = await client.SetLabelsAsync("<guid>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.SetLabelsAsync("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4881,15 +4478,15 @@ public async Task Example_SetLabels_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SetLabels_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    "<String>"
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.SetLabelsAsync("<guid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+            Response response = await client.SetLabelsAsync("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4897,15 +4494,12 @@ public async Task Example_SetLabels_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddLabel()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    "<String>"
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.AddLabel("<guid>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.AddLabel("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4913,15 +4507,15 @@ public void Example_AddLabel()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddLabel_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = client.AddLabel("<guid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+            Response response = client.AddLabel("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4929,15 +4523,12 @@ public void Example_AddLabel_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddLabel_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = await client.AddLabelAsync("<guid>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.AddLabelAsync("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4945,15 +4536,15 @@ public async Task Example_AddLabel_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddLabel_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    "<String>"
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.AddLabelAsync("<guid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+            Response response = await client.AddLabelAsync("<guid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4961,15 +4552,12 @@ public async Task Example_AddLabel_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteLabelsByUniqueAttribute()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    "<String>"
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.DeleteLabelsByUniqueAttribute("<typeName>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.DeleteLabelsByUniqueAttribute("<typeName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -4977,15 +4565,15 @@ public void Example_DeleteLabelsByUniqueAttribute()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteLabelsByUniqueAttribute_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = client.DeleteLabelsByUniqueAttribute("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+            Response response = client.DeleteLabelsByUniqueAttribute("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
             Console.WriteLine(response.Status);
         }
 
@@ -4993,15 +4581,12 @@ public void Example_DeleteLabelsByUniqueAttribute_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteLabelsByUniqueAttribute_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = await client.DeleteLabelsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.DeleteLabelsByUniqueAttributeAsync("<typeName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -5009,15 +4594,15 @@ public async Task Example_DeleteLabelsByUniqueAttribute_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteLabelsByUniqueAttribute_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    "<String>"
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.DeleteLabelsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+            Response response = await client.DeleteLabelsByUniqueAttributeAsync("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
             Console.WriteLine(response.Status);
         }
 
@@ -5025,15 +4610,12 @@ public async Task Example_DeleteLabelsByUniqueAttribute_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_SetLabelsByUniqueAttribute()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    "<String>"
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.SetLabelsByUniqueAttribute("<typeName>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.SetLabelsByUniqueAttribute("<typeName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -5041,15 +4623,15 @@ public void Example_SetLabelsByUniqueAttribute()
         [Ignore("Only validating compilation of examples")]
         public void Example_SetLabelsByUniqueAttribute_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = client.SetLabelsByUniqueAttribute("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+            Response response = client.SetLabelsByUniqueAttribute("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
             Console.WriteLine(response.Status);
         }
 
@@ -5057,15 +4639,12 @@ public void Example_SetLabelsByUniqueAttribute_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SetLabelsByUniqueAttribute_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = await client.SetLabelsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.SetLabelsByUniqueAttributeAsync("<typeName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -5073,15 +4652,15 @@ public async Task Example_SetLabelsByUniqueAttribute_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SetLabelsByUniqueAttribute_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    "<String>"
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.SetLabelsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+            Response response = await client.SetLabelsByUniqueAttributeAsync("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
             Console.WriteLine(response.Status);
         }
 
@@ -5089,15 +4668,12 @@ public async Task Example_SetLabelsByUniqueAttribute_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddLabelsByUniqueAttribute()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    "<String>"
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = client.AddLabelsByUniqueAttribute("<typeName>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.AddLabelsByUniqueAttribute("<typeName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -5105,15 +4681,15 @@ public void Example_AddLabelsByUniqueAttribute()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddLabelsByUniqueAttribute_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = client.AddLabelsByUniqueAttribute("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+            Response response = client.AddLabelsByUniqueAttribute("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
             Console.WriteLine(response.Status);
         }
 
@@ -5121,15 +4697,12 @@ public void Example_AddLabelsByUniqueAttribute_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddLabelsByUniqueAttribute_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = await client.AddLabelsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.AddLabelsByUniqueAttributeAsync("<typeName>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -5137,15 +4710,15 @@ public async Task Example_AddLabelsByUniqueAttribute_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddLabelsByUniqueAttribute_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
-
-            var data = new[] {
-    "<String>"
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewEntities client = new PurviewCatalogClient(endpoint, credential).GetPurviewEntitiesClient();
 
-            Response response = await client.AddLabelsByUniqueAttributeAsync("<typeName>", RequestContent.Create(data), "<attrQualifiedName>");
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<body>"
+});
+            Response response = await client.AddLabelsByUniqueAttributeAsync("<typeName>", content, attrQualifiedName: "<attrQualifiedName>");
             Console.WriteLine(response.Status);
         }
     }
diff --git a/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewGlossaries.cs b/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewGlossaries.cs
index 762a32794b0c..cf3840c4c8f9 100644
--- a/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewGlossaries.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewGlossaries.cs
@@ -11,6 +11,7 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Catalog;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +24,11 @@ internal class Samples_PurviewGlossaries
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossaries()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossaries(1234, 1234, "<sort>", true, new RequestContext());
+            Response response = client.GetGlossaries(null, null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -37,11 +38,11 @@ public void Example_GetGlossaries()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossaries_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossaries(1234, 1234, "<sort>", true, new RequestContext());
+            Response response = client.GetGlossaries(1234, 1234, "<sort>", true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -66,8 +67,8 @@ public void Example_GetGlossaries_AllParameters()
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -82,11 +83,11 @@ public void Example_GetGlossaries_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossaries_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossariesAsync(1234, 1234, "<sort>", true, new RequestContext());
+            Response response = await client.GetGlossariesAsync(null, null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -96,11 +97,11 @@ public async Task Example_GetGlossaries_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossaries_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossariesAsync(1234, 1234, "<sort>", true, new RequestContext());
+            Response response = await client.GetGlossariesAsync(1234, 1234, "<sort>", true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -125,8 +126,8 @@ public async Task Example_GetGlossaries_AllParameters_Async()
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -141,13 +142,12 @@ public async Task Example_GetGlossaries_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateGlossary()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new { };
-
-            Response response = client.CreateGlossary(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateGlossary(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -157,413 +157,76 @@ public void Example_CreateGlossary()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateGlossary_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                categoryInfo = new
-                {
-                    key = new
-                    {
-                        anchor = new
-                        {
-                            displayText = "<displayText>",
-                            glossaryGuid = "<glossaryGuid>",
-                            relationGuid = "<relationGuid>",
-                        },
-                        childrenCategories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    parentCategoryGuid = "<parentCategoryGuid>",
-                    relationGuid = "<relationGuid>",
-                }
-            },
-                        parentCategory = new
-                        {
-                            categoryGuid = "<categoryGuid>",
-                            description = "<description>",
-                            displayText = "<displayText>",
-                            parentCategoryGuid = "<parentCategoryGuid>",
-                            relationGuid = "<relationGuid>",
-                        },
-                        terms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        longDescription = "<longDescription>",
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                        shortDescription = "<shortDescription>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                        guid = "<guid>",
-                    },
-                },
-                termInfo = new
-                {
-                    key = new
-                    {
-                        abbreviation = "<abbreviation>",
-                        templateName = new[] {
-                new {}
-            },
-                        anchor = new
-                        {
-                            displayText = "<displayText>",
-                            glossaryGuid = "<glossaryGuid>",
-                            relationGuid = "<relationGuid>",
-                        },
-                        antonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        createTime = 123.45f,
-                        createdBy = "<createdBy>",
-                        updateTime = 123.45f,
-                        updatedBy = "<updatedBy>",
-                        status = "Draft",
-                        resources = new[] {
-                new {
-                    displayName = "<displayName>",
-                    url = "<url>",
-                }
-            },
-                        contacts = new
-                        {
-                            key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-                        },
-                        attributes = new
-                        {
-                            key = new
-                            {
-                                key = new { },
-                            },
-                        },
-                        assignedEntities = new[] {
-                new {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                            new {
-                                endTime = "<endTime>",
-                                startTime = "<startTime>",
-                                timeZone = "<timeZone>",
-                            }
-                        },
-                        source = "<source>",
-                        sourceDetails = new {
-                            key = new {},
-                        },
-                        attributes = new {
-                            key = new {},
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new {
-                        key = new {},
-                    },
-                }
-            },
-                        categories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    relationGuid = "<relationGuid>",
-                    status = "DRAFT",
-                }
-            },
-                        classifies = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        examples = new[] {
-                "<String>"
-            },
-                        isA = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        preferredTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        preferredToTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        replacedBy = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        replacementTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        seeAlso = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        synonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        translatedTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        translationTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        usage = "<usage>",
-                        validValues = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        validValuesFor = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        longDescription = "<longDescription>",
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                        shortDescription = "<shortDescription>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                        guid = "<guid>",
-                    },
-                },
-                categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-                language = "<language>",
-                terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                usage = "<usage>",
-                classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                longDescription = "<longDescription>",
-                name = "<name>",
-                qualifiedName = "<qualifiedName>",
-                shortDescription = "<shortDescription>",
-                lastModifiedTS = "<lastModifiedTS>",
-                guid = "<guid>",
-            };
-
-            Response response = client.CreateGlossary(RequestContent.Create(data));
+                ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+                ["language"] = "<language>",
+                ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                ["usage"] = "<usage>",
+                ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["longDescription"] = "<longDescription>",
+                ["name"] = "<name>",
+                ["qualifiedName"] = "<qualifiedName>",
+                ["shortDescription"] = "<shortDescription>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+                ["guid"] = "<guid>",
+            });
+            Response response = client.CreateGlossary(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -588,8 +251,8 @@ public void Example_CreateGlossary_AllParameters()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -604,13 +267,12 @@ public void Example_CreateGlossary_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateGlossary_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.CreateGlossaryAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateGlossaryAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -620,413 +282,76 @@ public async Task Example_CreateGlossary_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateGlossary_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                categoryInfo = new
-                {
-                    key = new
-                    {
-                        anchor = new
-                        {
-                            displayText = "<displayText>",
-                            glossaryGuid = "<glossaryGuid>",
-                            relationGuid = "<relationGuid>",
-                        },
-                        childrenCategories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    parentCategoryGuid = "<parentCategoryGuid>",
-                    relationGuid = "<relationGuid>",
-                }
-            },
-                        parentCategory = new
-                        {
-                            categoryGuid = "<categoryGuid>",
-                            description = "<description>",
-                            displayText = "<displayText>",
-                            parentCategoryGuid = "<parentCategoryGuid>",
-                            relationGuid = "<relationGuid>",
-                        },
-                        terms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        longDescription = "<longDescription>",
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                        shortDescription = "<shortDescription>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                        guid = "<guid>",
-                    },
-                },
-                termInfo = new
-                {
-                    key = new
-                    {
-                        abbreviation = "<abbreviation>",
-                        templateName = new[] {
-                new {}
-            },
-                        anchor = new
-                        {
-                            displayText = "<displayText>",
-                            glossaryGuid = "<glossaryGuid>",
-                            relationGuid = "<relationGuid>",
-                        },
-                        antonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        createTime = 123.45f,
-                        createdBy = "<createdBy>",
-                        updateTime = 123.45f,
-                        updatedBy = "<updatedBy>",
-                        status = "Draft",
-                        resources = new[] {
-                new {
-                    displayName = "<displayName>",
-                    url = "<url>",
-                }
-            },
-                        contacts = new
-                        {
-                            key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-                        },
-                        attributes = new
-                        {
-                            key = new
-                            {
-                                key = new { },
-                            },
-                        },
-                        assignedEntities = new[] {
-                new {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                            new {
-                                endTime = "<endTime>",
-                                startTime = "<startTime>",
-                                timeZone = "<timeZone>",
-                            }
-                        },
-                        source = "<source>",
-                        sourceDetails = new {
-                            key = new {},
-                        },
-                        attributes = new {
-                            key = new {},
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new {
-                        key = new {},
-                    },
-                }
-            },
-                        categories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    relationGuid = "<relationGuid>",
-                    status = "DRAFT",
-                }
-            },
-                        classifies = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        examples = new[] {
-                "<String>"
-            },
-                        isA = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        preferredTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        preferredToTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        replacedBy = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        replacementTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        seeAlso = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        synonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        translatedTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        translationTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        usage = "<usage>",
-                        validValues = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        validValuesFor = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        longDescription = "<longDescription>",
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                        shortDescription = "<shortDescription>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                        guid = "<guid>",
-                    },
-                },
-                categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-                language = "<language>",
-                terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                usage = "<usage>",
-                classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                longDescription = "<longDescription>",
-                name = "<name>",
-                qualifiedName = "<qualifiedName>",
-                shortDescription = "<shortDescription>",
-                lastModifiedTS = "<lastModifiedTS>",
-                guid = "<guid>",
-            };
-
-            Response response = await client.CreateGlossaryAsync(RequestContent.Create(data));
+                ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+                ["language"] = "<language>",
+                ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                ["usage"] = "<usage>",
+                ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["longDescription"] = "<longDescription>",
+                ["name"] = "<name>",
+                ["qualifiedName"] = "<qualifiedName>",
+                ["shortDescription"] = "<shortDescription>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+                ["guid"] = "<guid>",
+            });
+            Response response = await client.CreateGlossaryAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -1051,8 +376,8 @@ public async Task Example_CreateGlossary_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -1067,15 +392,15 @@ public async Task Example_CreateGlossary_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateGlossaryCategories()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {}
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.CreateGlossaryCategories(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = client.CreateGlossaryCategories(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -1085,78 +410,85 @@ public void Example_CreateGlossaryCategories()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateGlossaryCategories_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {
-        anchor = new {
-            displayText = "<displayText>",
-            glossaryGuid = "<glossaryGuid>",
-            relationGuid = "<relationGuid>",
-        },
-        childrenCategories = new[] {
-            new {
-                categoryGuid = "<categoryGuid>",
-                description = "<description>",
-                displayText = "<displayText>",
-                parentCategoryGuid = "<parentCategoryGuid>",
-                relationGuid = "<relationGuid>",
-            }
-        },
-        parentCategory = new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        },
-        terms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-        longDescription = "<longDescription>",
-        name = "<name>",
-        qualifiedName = "<qualifiedName>",
-        shortDescription = "<shortDescription>",
-        lastModifiedTS = "<lastModifiedTS>",
-        guid = "<guid>",
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.CreateGlossaryCategories(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["anchor"] = new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["glossaryGuid"] = "<glossaryGuid>",
+["relationGuid"] = "<relationGuid>",
+},
+["childrenCategories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+["parentCategory"] = null
+,
+["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["longDescription"] = "<longDescription>",
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+["shortDescription"] = "<shortDescription>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+["guid"] = "<guid>",
+}
+});
+            Response response = client.CreateGlossaryCategories(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1187,8 +519,8 @@ public void Example_CreateGlossaryCategories_AllParameters()
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -1203,15 +535,15 @@ public void Example_CreateGlossaryCategories_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateGlossaryCategories_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {}
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.CreateGlossaryCategoriesAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = await client.CreateGlossaryCategoriesAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -1221,78 +553,85 @@ public async Task Example_CreateGlossaryCategories_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateGlossaryCategories_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {
-        anchor = new {
-            displayText = "<displayText>",
-            glossaryGuid = "<glossaryGuid>",
-            relationGuid = "<relationGuid>",
-        },
-        childrenCategories = new[] {
-            new {
-                categoryGuid = "<categoryGuid>",
-                description = "<description>",
-                displayText = "<displayText>",
-                parentCategoryGuid = "<parentCategoryGuid>",
-                relationGuid = "<relationGuid>",
-            }
-        },
-        parentCategory = new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        },
-        terms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-        longDescription = "<longDescription>",
-        name = "<name>",
-        qualifiedName = "<qualifiedName>",
-        shortDescription = "<shortDescription>",
-        lastModifiedTS = "<lastModifiedTS>",
-        guid = "<guid>",
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.CreateGlossaryCategoriesAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["anchor"] = new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["glossaryGuid"] = "<glossaryGuid>",
+["relationGuid"] = "<relationGuid>",
+},
+["childrenCategories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+["parentCategory"] = null
+,
+["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["longDescription"] = "<longDescription>",
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+["shortDescription"] = "<shortDescription>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+["guid"] = "<guid>",
+}
+});
+            Response response = await client.CreateGlossaryCategoriesAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1323,8 +662,8 @@ public async Task Example_CreateGlossaryCategories_AllParameters_Async()
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -1339,13 +678,12 @@ public async Task Example_CreateGlossaryCategories_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateGlossaryCategory()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.CreateGlossaryCategory(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateGlossaryCategory(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1355,79 +693,82 @@ public void Example_CreateGlossaryCategory()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateGlossaryCategory_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                anchor = new
+                ["anchor"] = new Dictionary<string, object>()
                 {
-                    displayText = "<displayText>",
-                    glossaryGuid = "<glossaryGuid>",
-                    relationGuid = "<relationGuid>",
+                    ["displayText"] = "<displayText>",
+                    ["glossaryGuid"] = "<glossaryGuid>",
+                    ["relationGuid"] = "<relationGuid>",
                 },
-                childrenCategories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-                parentCategory = new
-                {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    parentCategoryGuid = "<parentCategoryGuid>",
-                    relationGuid = "<relationGuid>",
-                },
-                terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                longDescription = "<longDescription>",
-                name = "<name>",
-                qualifiedName = "<qualifiedName>",
-                shortDescription = "<shortDescription>",
-                lastModifiedTS = "<lastModifiedTS>",
-                guid = "<guid>",
-            };
-
-            Response response = client.CreateGlossaryCategory(RequestContent.Create(data));
+                ["childrenCategories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+                ["parentCategory"] = null
+            ,
+                ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["longDescription"] = "<longDescription>",
+                ["name"] = "<name>",
+                ["qualifiedName"] = "<qualifiedName>",
+                ["shortDescription"] = "<shortDescription>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+                ["guid"] = "<guid>",
+            });
+            Response response = client.CreateGlossaryCategory(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1458,8 +799,8 @@ public void Example_CreateGlossaryCategory_AllParameters()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -1474,13 +815,12 @@ public void Example_CreateGlossaryCategory_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateGlossaryCategory_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.CreateGlossaryCategoryAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateGlossaryCategoryAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1490,79 +830,82 @@ public async Task Example_CreateGlossaryCategory_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateGlossaryCategory_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                anchor = new
-                {
-                    displayText = "<displayText>",
-                    glossaryGuid = "<glossaryGuid>",
-                    relationGuid = "<relationGuid>",
-                },
-                childrenCategories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-                parentCategory = new
+                ["anchor"] = new Dictionary<string, object>()
                 {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    parentCategoryGuid = "<parentCategoryGuid>",
-                    relationGuid = "<relationGuid>",
+                    ["displayText"] = "<displayText>",
+                    ["glossaryGuid"] = "<glossaryGuid>",
+                    ["relationGuid"] = "<relationGuid>",
                 },
-                terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                longDescription = "<longDescription>",
-                name = "<name>",
-                qualifiedName = "<qualifiedName>",
-                shortDescription = "<shortDescription>",
-                lastModifiedTS = "<lastModifiedTS>",
-                guid = "<guid>",
-            };
-
-            Response response = await client.CreateGlossaryCategoryAsync(RequestContent.Create(data));
+                ["childrenCategories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+                ["parentCategory"] = null
+            ,
+                ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["longDescription"] = "<longDescription>",
+                ["name"] = "<name>",
+                ["qualifiedName"] = "<qualifiedName>",
+                ["shortDescription"] = "<shortDescription>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+                ["guid"] = "<guid>",
+            });
+            Response response = await client.CreateGlossaryCategoryAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1593,8 +936,8 @@ public async Task Example_CreateGlossaryCategory_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -1609,11 +952,11 @@ public async Task Example_CreateGlossaryCategory_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossaryCategory()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossaryCategory("<categoryGuid>", new RequestContext());
+            Response response = client.GetGlossaryCategory("<categoryGuid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1623,11 +966,11 @@ public void Example_GetGlossaryCategory()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossaryCategory_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossaryCategory("<categoryGuid>", new RequestContext());
+            Response response = client.GetGlossaryCategory("<categoryGuid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1658,8 +1001,8 @@ public void Example_GetGlossaryCategory_AllParameters()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -1674,11 +1017,11 @@ public void Example_GetGlossaryCategory_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossaryCategory_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossaryCategoryAsync("<categoryGuid>", new RequestContext());
+            Response response = await client.GetGlossaryCategoryAsync("<categoryGuid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1688,11 +1031,11 @@ public async Task Example_GetGlossaryCategory_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossaryCategory_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossaryCategoryAsync("<categoryGuid>", new RequestContext());
+            Response response = await client.GetGlossaryCategoryAsync("<categoryGuid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1723,8 +1066,8 @@ public async Task Example_GetGlossaryCategory_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -1739,13 +1082,12 @@ public async Task Example_GetGlossaryCategory_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateGlossaryCategory()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new { };
-
-            Response response = client.UpdateGlossaryCategory("<categoryGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.UpdateGlossaryCategory("<categoryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1755,79 +1097,82 @@ public void Example_UpdateGlossaryCategory()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateGlossaryCategory_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                anchor = new
-                {
-                    displayText = "<displayText>",
-                    glossaryGuid = "<glossaryGuid>",
-                    relationGuid = "<relationGuid>",
-                },
-                childrenCategories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-                parentCategory = new
+                ["anchor"] = new Dictionary<string, object>()
                 {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    parentCategoryGuid = "<parentCategoryGuid>",
-                    relationGuid = "<relationGuid>",
+                    ["displayText"] = "<displayText>",
+                    ["glossaryGuid"] = "<glossaryGuid>",
+                    ["relationGuid"] = "<relationGuid>",
                 },
-                terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                longDescription = "<longDescription>",
-                name = "<name>",
-                qualifiedName = "<qualifiedName>",
-                shortDescription = "<shortDescription>",
-                lastModifiedTS = "<lastModifiedTS>",
-                guid = "<guid>",
-            };
-
-            Response response = client.UpdateGlossaryCategory("<categoryGuid>", RequestContent.Create(data));
+                ["childrenCategories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+                ["parentCategory"] = null
+            ,
+                ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["longDescription"] = "<longDescription>",
+                ["name"] = "<name>",
+                ["qualifiedName"] = "<qualifiedName>",
+                ["shortDescription"] = "<shortDescription>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+                ["guid"] = "<guid>",
+            });
+            Response response = client.UpdateGlossaryCategory("<categoryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1858,8 +1203,8 @@ public void Example_UpdateGlossaryCategory_AllParameters()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -1874,13 +1219,12 @@ public void Example_UpdateGlossaryCategory_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateGlossaryCategory_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.UpdateGlossaryCategoryAsync("<categoryGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.UpdateGlossaryCategoryAsync("<categoryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1890,79 +1234,82 @@ public async Task Example_UpdateGlossaryCategory_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateGlossaryCategory_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                anchor = new
+                ["anchor"] = new Dictionary<string, object>()
                 {
-                    displayText = "<displayText>",
-                    glossaryGuid = "<glossaryGuid>",
-                    relationGuid = "<relationGuid>",
+                    ["displayText"] = "<displayText>",
+                    ["glossaryGuid"] = "<glossaryGuid>",
+                    ["relationGuid"] = "<relationGuid>",
                 },
-                childrenCategories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-                parentCategory = new
-                {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    parentCategoryGuid = "<parentCategoryGuid>",
-                    relationGuid = "<relationGuid>",
-                },
-                terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                longDescription = "<longDescription>",
-                name = "<name>",
-                qualifiedName = "<qualifiedName>",
-                shortDescription = "<shortDescription>",
-                lastModifiedTS = "<lastModifiedTS>",
-                guid = "<guid>",
-            };
-
-            Response response = await client.UpdateGlossaryCategoryAsync("<categoryGuid>", RequestContent.Create(data));
+                ["childrenCategories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+                ["parentCategory"] = null
+            ,
+                ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["longDescription"] = "<longDescription>",
+                ["name"] = "<name>",
+                ["qualifiedName"] = "<qualifiedName>",
+                ["shortDescription"] = "<shortDescription>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+                ["guid"] = "<guid>",
+            });
+            Response response = await client.UpdateGlossaryCategoryAsync("<categoryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -1993,8 +1340,8 @@ public async Task Example_UpdateGlossaryCategory_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -2009,9 +1356,9 @@ public async Task Example_UpdateGlossaryCategory_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteGlossaryCategory()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
             Response response = client.DeleteGlossaryCategory("<categoryGuid>");
             Console.WriteLine(response.Status);
@@ -2021,9 +1368,9 @@ public void Example_DeleteGlossaryCategory()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteGlossaryCategory_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
             Response response = client.DeleteGlossaryCategory("<categoryGuid>");
             Console.WriteLine(response.Status);
@@ -2033,9 +1380,9 @@ public void Example_DeleteGlossaryCategory_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteGlossaryCategory_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
             Response response = await client.DeleteGlossaryCategoryAsync("<categoryGuid>");
             Console.WriteLine(response.Status);
@@ -2045,9 +1392,9 @@ public async Task Example_DeleteGlossaryCategory_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteGlossaryCategory_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
             Response response = await client.DeleteGlossaryCategoryAsync("<categoryGuid>");
             Console.WriteLine(response.Status);
@@ -2057,16 +1404,15 @@ public async Task Example_DeleteGlossaryCategory_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_PartialUpdateGlossaryCategory()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = "<String>",
-            };
-
-            Response response = client.PartialUpdateGlossaryCategory("<categoryGuid>", RequestContent.Create(data));
+                ["key"] = "<partialUpdates>",
+            });
+            Response response = client.PartialUpdateGlossaryCategory("<categoryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2076,16 +1422,15 @@ public void Example_PartialUpdateGlossaryCategory()
         [Ignore("Only validating compilation of examples")]
         public void Example_PartialUpdateGlossaryCategory_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = "<String>",
-            };
-
-            Response response = client.PartialUpdateGlossaryCategory("<categoryGuid>", RequestContent.Create(data));
+                ["key"] = "<partialUpdates>",
+            });
+            Response response = client.PartialUpdateGlossaryCategory("<categoryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -2116,8 +1461,8 @@ public void Example_PartialUpdateGlossaryCategory_AllParameters()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -2132,16 +1477,15 @@ public void Example_PartialUpdateGlossaryCategory_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_PartialUpdateGlossaryCategory_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = "<String>",
-            };
-
-            Response response = await client.PartialUpdateGlossaryCategoryAsync("<categoryGuid>", RequestContent.Create(data));
+                ["key"] = "<partialUpdates>",
+            });
+            Response response = await client.PartialUpdateGlossaryCategoryAsync("<categoryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2151,16 +1495,15 @@ public async Task Example_PartialUpdateGlossaryCategory_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_PartialUpdateGlossaryCategory_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = "<String>",
-            };
-
-            Response response = await client.PartialUpdateGlossaryCategoryAsync("<categoryGuid>", RequestContent.Create(data));
+                ["key"] = "<partialUpdates>",
+            });
+            Response response = await client.PartialUpdateGlossaryCategoryAsync("<categoryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("anchor").GetProperty("displayText").ToString());
@@ -2191,8 +1534,8 @@ public async Task Example_PartialUpdateGlossaryCategory_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -2207,75 +1550,75 @@ public async Task Example_PartialUpdateGlossaryCategory_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRelatedCategories()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetRelatedCategories("<categoryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetRelatedCategories("<categoryGuid>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>")[0].ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRelatedCategories_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetRelatedCategories("<categoryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetRelatedCategories("<categoryGuid>", 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("categoryGuid").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("parentCategoryGuid").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("categoryGuid").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("parentCategoryGuid").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("relationGuid").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRelatedCategories_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetRelatedCategoriesAsync("<categoryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetRelatedCategoriesAsync("<categoryGuid>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>")[0].ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRelatedCategories_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetRelatedCategoriesAsync("<categoryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetRelatedCategoriesAsync("<categoryGuid>", 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("categoryGuid").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("parentCategoryGuid").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("categoryGuid").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("parentCategoryGuid").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("relationGuid").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCategoryTerms()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetCategoryTerms("<categoryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetCategoryTerms("<categoryGuid>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -2285,11 +1628,11 @@ public void Example_GetCategoryTerms()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetCategoryTerms_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetCategoryTerms("<categoryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetCategoryTerms("<categoryGuid>", 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("description").ToString());
@@ -2306,11 +1649,11 @@ public void Example_GetCategoryTerms_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCategoryTerms_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetCategoryTermsAsync("<categoryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetCategoryTermsAsync("<categoryGuid>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -2320,11 +1663,11 @@ public async Task Example_GetCategoryTerms_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetCategoryTerms_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetCategoryTermsAsync("<categoryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetCategoryTermsAsync("<categoryGuid>", 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("description").ToString());
@@ -2341,13 +1684,12 @@ public async Task Example_GetCategoryTerms_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateGlossaryTerm()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.CreateGlossaryTerm(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateGlossaryTerm(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2357,285 +1699,195 @@ public void Example_CreateGlossaryTerm()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateGlossaryTerm_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                abbreviation = "<abbreviation>",
-                templateName = new[] {
-        new {}
-    },
-                anchor = new
+                ["abbreviation"] = "<abbreviation>",
+                ["templateName"] = new List<object>()
+{
+new Dictionary<string, object>()
+},
+                ["anchor"] = new Dictionary<string, object>()
                 {
-                    displayText = "<displayText>",
-                    glossaryGuid = "<glossaryGuid>",
-                    relationGuid = "<relationGuid>",
+                    ["displayText"] = "<displayText>",
+                    ["glossaryGuid"] = "<glossaryGuid>",
+                    ["relationGuid"] = "<relationGuid>",
                 },
-                antonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                createTime = 123.45f,
-                createdBy = "<createdBy>",
-                updateTime = 123.45f,
-                updatedBy = "<updatedBy>",
-                status = "Draft",
-                resources = new[] {
-        new {
-            displayName = "<displayName>",
-            url = "<url>",
-        }
-    },
-                contacts = new
+                ["antonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                ["createTime"] = 123.45F,
+                ["createdBy"] = "<createdBy>",
+                ["updateTime"] = 123.45F,
+                ["updatedBy"] = "<updatedBy>",
+                ["status"] = "Draft",
+                ["resources"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["url"] = "<url>",
+}
+},
+                ["contacts"] = new Dictionary<string, object>()
                 {
-                    key = new[] {
-            new {
-                id = "<id>",
-                info = "<info>",
-            }
-        },
+                    ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
                 },
-                attributes = new
+                ["attributes"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
                 },
-                assignedEntities = new[] {
-        new {
-            displayText = "<displayText>",
-            entityStatus = "ACTIVE",
-            relationshipType = "<relationshipType>",
-            relationshipAttributes = new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            },
-            relationshipGuid = "<relationshipGuid>",
-            relationshipStatus = "ACTIVE",
-            guid = "<guid>",
-            typeName = "<typeName>",
-            uniqueAttributes = new {
-                key = new {},
-            },
-        }
-    },
-                categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            relationGuid = "<relationGuid>",
-            status = "DRAFT",
-        }
-    },
-                classifies = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                examples = new[] {
-        "<String>"
-    },
-                isA = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                preferredTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                preferredToTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                replacedBy = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                replacementTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                seeAlso = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                synonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                translatedTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                translationTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                usage = "<usage>",
-                validValues = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                validValuesFor = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                longDescription = "<longDescription>",
-                name = "<name>",
-                qualifiedName = "<qualifiedName>",
-                shortDescription = "<shortDescription>",
-                lastModifiedTS = "<lastModifiedTS>",
-                guid = "<guid>",
-            };
-
-            Response response = client.CreateGlossaryTerm(RequestContent.Create(data), true);
+                ["assignedEntities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+},
+                ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["relationGuid"] = "<relationGuid>",
+["status"] = "DRAFT",
+}
+},
+                ["classifies"] = new List<object>()
+{
+null
+},
+                ["examples"] = new List<object>()
+{
+"<examples>"
+},
+                ["isA"] = new List<object>()
+{
+null
+},
+                ["preferredTerms"] = new List<object>()
+{
+null
+},
+                ["preferredToTerms"] = new List<object>()
+{
+null
+},
+                ["replacedBy"] = new List<object>()
+{
+null
+},
+                ["replacementTerms"] = new List<object>()
+{
+null
+},
+                ["seeAlso"] = new List<object>()
+{
+null
+},
+                ["synonyms"] = new List<object>()
+{
+null
+},
+                ["translatedTerms"] = new List<object>()
+{
+null
+},
+                ["translationTerms"] = new List<object>()
+{
+null
+},
+                ["usage"] = "<usage>",
+                ["validValues"] = new List<object>()
+{
+null
+},
+                ["validValuesFor"] = new List<object>()
+{
+null
+},
+                ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["longDescription"] = "<longDescription>",
+                ["name"] = "<name>",
+                ["qualifiedName"] = "<qualifiedName>",
+                ["shortDescription"] = "<shortDescription>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+                ["guid"] = "<guid>",
+            });
+            Response response = client.CreateGlossaryTerm(content, includeTermHierarchy: true);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -2658,20 +1910,20 @@ public void Example_CreateGlossaryTerm_AllParameters()
             Console.WriteLine(result.GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -2782,8 +2034,8 @@ public void Example_CreateGlossaryTerm_AllParameters()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -2798,13 +2050,12 @@ public void Example_CreateGlossaryTerm_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateGlossaryTerm_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.CreateGlossaryTermAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateGlossaryTermAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2814,285 +2065,195 @@ public async Task Example_CreateGlossaryTerm_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateGlossaryTerm_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                abbreviation = "<abbreviation>",
-                templateName = new[] {
-        new {}
-    },
-                anchor = new
+                ["abbreviation"] = "<abbreviation>",
+                ["templateName"] = new List<object>()
+{
+new Dictionary<string, object>()
+},
+                ["anchor"] = new Dictionary<string, object>()
                 {
-                    displayText = "<displayText>",
-                    glossaryGuid = "<glossaryGuid>",
-                    relationGuid = "<relationGuid>",
+                    ["displayText"] = "<displayText>",
+                    ["glossaryGuid"] = "<glossaryGuid>",
+                    ["relationGuid"] = "<relationGuid>",
                 },
-                antonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                createTime = 123.45f,
-                createdBy = "<createdBy>",
-                updateTime = 123.45f,
-                updatedBy = "<updatedBy>",
-                status = "Draft",
-                resources = new[] {
-        new {
-            displayName = "<displayName>",
-            url = "<url>",
-        }
-    },
-                contacts = new
+                ["antonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                ["createTime"] = 123.45F,
+                ["createdBy"] = "<createdBy>",
+                ["updateTime"] = 123.45F,
+                ["updatedBy"] = "<updatedBy>",
+                ["status"] = "Draft",
+                ["resources"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["url"] = "<url>",
+}
+},
+                ["contacts"] = new Dictionary<string, object>()
                 {
-                    key = new[] {
-            new {
-                id = "<id>",
-                info = "<info>",
-            }
-        },
+                    ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
                 },
-                attributes = new
+                ["attributes"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
                 },
-                assignedEntities = new[] {
-        new {
-            displayText = "<displayText>",
-            entityStatus = "ACTIVE",
-            relationshipType = "<relationshipType>",
-            relationshipAttributes = new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            },
-            relationshipGuid = "<relationshipGuid>",
-            relationshipStatus = "ACTIVE",
-            guid = "<guid>",
-            typeName = "<typeName>",
-            uniqueAttributes = new {
-                key = new {},
-            },
-        }
-    },
-                categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            relationGuid = "<relationGuid>",
-            status = "DRAFT",
-        }
-    },
-                classifies = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                examples = new[] {
-        "<String>"
-    },
-                isA = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                preferredTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                preferredToTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                replacedBy = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                replacementTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                seeAlso = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                synonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                translatedTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                translationTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                usage = "<usage>",
-                validValues = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                validValuesFor = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                longDescription = "<longDescription>",
-                name = "<name>",
-                qualifiedName = "<qualifiedName>",
-                shortDescription = "<shortDescription>",
-                lastModifiedTS = "<lastModifiedTS>",
-                guid = "<guid>",
-            };
-
-            Response response = await client.CreateGlossaryTermAsync(RequestContent.Create(data), true);
+                ["assignedEntities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+},
+                ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["relationGuid"] = "<relationGuid>",
+["status"] = "DRAFT",
+}
+},
+                ["classifies"] = new List<object>()
+{
+null
+},
+                ["examples"] = new List<object>()
+{
+"<examples>"
+},
+                ["isA"] = new List<object>()
+{
+null
+},
+                ["preferredTerms"] = new List<object>()
+{
+null
+},
+                ["preferredToTerms"] = new List<object>()
+{
+null
+},
+                ["replacedBy"] = new List<object>()
+{
+null
+},
+                ["replacementTerms"] = new List<object>()
+{
+null
+},
+                ["seeAlso"] = new List<object>()
+{
+null
+},
+                ["synonyms"] = new List<object>()
+{
+null
+},
+                ["translatedTerms"] = new List<object>()
+{
+null
+},
+                ["translationTerms"] = new List<object>()
+{
+null
+},
+                ["usage"] = "<usage>",
+                ["validValues"] = new List<object>()
+{
+null
+},
+                ["validValuesFor"] = new List<object>()
+{
+null
+},
+                ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["longDescription"] = "<longDescription>",
+                ["name"] = "<name>",
+                ["qualifiedName"] = "<qualifiedName>",
+                ["shortDescription"] = "<shortDescription>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+                ["guid"] = "<guid>",
+            });
+            Response response = await client.CreateGlossaryTermAsync(content, includeTermHierarchy: true);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -3115,20 +2276,20 @@ public async Task Example_CreateGlossaryTerm_AllParameters_Async()
             Console.WriteLine(result.GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -3239,8 +2400,8 @@ public async Task Example_CreateGlossaryTerm_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -3255,11 +2416,11 @@ public async Task Example_CreateGlossaryTerm_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossaryTerm()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossaryTerm("<termGuid>", true, new string[] { "<excludeRelationshipTypeList>" }, new RequestContext());
+            Response response = client.GetGlossaryTerm("<termGuid>", null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -3269,11 +2430,14 @@ public void Example_GetGlossaryTerm()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossaryTerm_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossaryTerm("<termGuid>", true, new string[] { "<excludeRelationshipTypeList>" }, new RequestContext());
+            Response response = client.GetGlossaryTerm("<termGuid>", true, new List<string>()
+{
+"<excludeRelationshipTypeList>"
+}, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -3296,20 +2460,20 @@ public void Example_GetGlossaryTerm_AllParameters()
             Console.WriteLine(result.GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -3420,8 +2584,8 @@ public void Example_GetGlossaryTerm_AllParameters()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -3436,11 +2600,11 @@ public void Example_GetGlossaryTerm_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossaryTerm_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossaryTermAsync("<termGuid>", true, new string[] { "<excludeRelationshipTypeList>" }, new RequestContext());
+            Response response = await client.GetGlossaryTermAsync("<termGuid>", null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -3450,11 +2614,14 @@ public async Task Example_GetGlossaryTerm_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossaryTerm_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossaryTermAsync("<termGuid>", true, new string[] { "<excludeRelationshipTypeList>" }, new RequestContext());
+            Response response = await client.GetGlossaryTermAsync("<termGuid>", true, new List<string>()
+{
+"<excludeRelationshipTypeList>"
+}, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -3477,20 +2644,20 @@ public async Task Example_GetGlossaryTerm_AllParameters_Async()
             Console.WriteLine(result.GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -3601,8 +2768,8 @@ public async Task Example_GetGlossaryTerm_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -3617,13 +2784,12 @@ public async Task Example_GetGlossaryTerm_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateGlossaryTerm()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new { };
-
-            Response response = client.UpdateGlossaryTerm("<termGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.UpdateGlossaryTerm("<termGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -3633,285 +2799,195 @@ public void Example_UpdateGlossaryTerm()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateGlossaryTerm_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                abbreviation = "<abbreviation>",
-                templateName = new[] {
-        new {}
-    },
-                anchor = new
+                ["abbreviation"] = "<abbreviation>",
+                ["templateName"] = new List<object>()
+{
+new Dictionary<string, object>()
+},
+                ["anchor"] = new Dictionary<string, object>()
                 {
-                    displayText = "<displayText>",
-                    glossaryGuid = "<glossaryGuid>",
-                    relationGuid = "<relationGuid>",
+                    ["displayText"] = "<displayText>",
+                    ["glossaryGuid"] = "<glossaryGuid>",
+                    ["relationGuid"] = "<relationGuid>",
                 },
-                antonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                createTime = 123.45f,
-                createdBy = "<createdBy>",
-                updateTime = 123.45f,
-                updatedBy = "<updatedBy>",
-                status = "Draft",
-                resources = new[] {
-        new {
-            displayName = "<displayName>",
-            url = "<url>",
-        }
-    },
-                contacts = new
+                ["antonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                ["createTime"] = 123.45F,
+                ["createdBy"] = "<createdBy>",
+                ["updateTime"] = 123.45F,
+                ["updatedBy"] = "<updatedBy>",
+                ["status"] = "Draft",
+                ["resources"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["url"] = "<url>",
+}
+},
+                ["contacts"] = new Dictionary<string, object>()
                 {
-                    key = new[] {
-            new {
-                id = "<id>",
-                info = "<info>",
-            }
-        },
+                    ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
                 },
-                attributes = new
+                ["attributes"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
                 },
-                assignedEntities = new[] {
-        new {
-            displayText = "<displayText>",
-            entityStatus = "ACTIVE",
-            relationshipType = "<relationshipType>",
-            relationshipAttributes = new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            },
-            relationshipGuid = "<relationshipGuid>",
-            relationshipStatus = "ACTIVE",
-            guid = "<guid>",
-            typeName = "<typeName>",
-            uniqueAttributes = new {
-                key = new {},
-            },
-        }
-    },
-                categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            relationGuid = "<relationGuid>",
-            status = "DRAFT",
-        }
-    },
-                classifies = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                examples = new[] {
-        "<String>"
-    },
-                isA = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                preferredTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                preferredToTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                replacedBy = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                replacementTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                seeAlso = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                synonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                translatedTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                translationTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                usage = "<usage>",
-                validValues = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                validValuesFor = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                longDescription = "<longDescription>",
-                name = "<name>",
-                qualifiedName = "<qualifiedName>",
-                shortDescription = "<shortDescription>",
-                lastModifiedTS = "<lastModifiedTS>",
-                guid = "<guid>",
-            };
-
-            Response response = client.UpdateGlossaryTerm("<termGuid>", RequestContent.Create(data), true);
+                ["assignedEntities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+},
+                ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["relationGuid"] = "<relationGuid>",
+["status"] = "DRAFT",
+}
+},
+                ["classifies"] = new List<object>()
+{
+null
+},
+                ["examples"] = new List<object>()
+{
+"<examples>"
+},
+                ["isA"] = new List<object>()
+{
+null
+},
+                ["preferredTerms"] = new List<object>()
+{
+null
+},
+                ["preferredToTerms"] = new List<object>()
+{
+null
+},
+                ["replacedBy"] = new List<object>()
+{
+null
+},
+                ["replacementTerms"] = new List<object>()
+{
+null
+},
+                ["seeAlso"] = new List<object>()
+{
+null
+},
+                ["synonyms"] = new List<object>()
+{
+null
+},
+                ["translatedTerms"] = new List<object>()
+{
+null
+},
+                ["translationTerms"] = new List<object>()
+{
+null
+},
+                ["usage"] = "<usage>",
+                ["validValues"] = new List<object>()
+{
+null
+},
+                ["validValuesFor"] = new List<object>()
+{
+null
+},
+                ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["longDescription"] = "<longDescription>",
+                ["name"] = "<name>",
+                ["qualifiedName"] = "<qualifiedName>",
+                ["shortDescription"] = "<shortDescription>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+                ["guid"] = "<guid>",
+            });
+            Response response = client.UpdateGlossaryTerm("<termGuid>", content, includeTermHierarchy: true);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -3934,20 +3010,20 @@ public void Example_UpdateGlossaryTerm_AllParameters()
             Console.WriteLine(result.GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -4058,8 +3134,8 @@ public void Example_UpdateGlossaryTerm_AllParameters()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -4074,13 +3150,12 @@ public void Example_UpdateGlossaryTerm_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateGlossaryTerm_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new { };
-
-            Response response = await client.UpdateGlossaryTermAsync("<termGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.UpdateGlossaryTermAsync("<termGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -4090,285 +3165,195 @@ public async Task Example_UpdateGlossaryTerm_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateGlossaryTerm_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                abbreviation = "<abbreviation>",
-                templateName = new[] {
-        new {}
-    },
-                anchor = new
+                ["abbreviation"] = "<abbreviation>",
+                ["templateName"] = new List<object>()
+{
+new Dictionary<string, object>()
+},
+                ["anchor"] = new Dictionary<string, object>()
                 {
-                    displayText = "<displayText>",
-                    glossaryGuid = "<glossaryGuid>",
-                    relationGuid = "<relationGuid>",
+                    ["displayText"] = "<displayText>",
+                    ["glossaryGuid"] = "<glossaryGuid>",
+                    ["relationGuid"] = "<relationGuid>",
                 },
-                antonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                createTime = 123.45f,
-                createdBy = "<createdBy>",
-                updateTime = 123.45f,
-                updatedBy = "<updatedBy>",
-                status = "Draft",
-                resources = new[] {
-        new {
-            displayName = "<displayName>",
-            url = "<url>",
-        }
-    },
-                contacts = new
+                ["antonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                ["createTime"] = 123.45F,
+                ["createdBy"] = "<createdBy>",
+                ["updateTime"] = 123.45F,
+                ["updatedBy"] = "<updatedBy>",
+                ["status"] = "Draft",
+                ["resources"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["url"] = "<url>",
+}
+},
+                ["contacts"] = new Dictionary<string, object>()
                 {
-                    key = new[] {
-            new {
-                id = "<id>",
-                info = "<info>",
-            }
-        },
+                    ["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
                 },
-                attributes = new
+                ["attributes"] = new Dictionary<string, object>()
                 {
-                    key = new
+                    ["key"] = new Dictionary<string, object>()
                     {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
                 },
-                assignedEntities = new[] {
-        new {
-            displayText = "<displayText>",
-            entityStatus = "ACTIVE",
-            relationshipType = "<relationshipType>",
-            relationshipAttributes = new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            },
-            relationshipGuid = "<relationshipGuid>",
-            relationshipStatus = "ACTIVE",
-            guid = "<guid>",
-            typeName = "<typeName>",
-            uniqueAttributes = new {
-                key = new {},
-            },
-        }
-    },
-                categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            relationGuid = "<relationGuid>",
-            status = "DRAFT",
-        }
-    },
-                classifies = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                examples = new[] {
-        "<String>"
-    },
-                isA = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                preferredTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                preferredToTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                replacedBy = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                replacementTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                seeAlso = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                synonyms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                translatedTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                translationTerms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                usage = "<usage>",
-                validValues = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                validValuesFor = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                longDescription = "<longDescription>",
-                name = "<name>",
-                qualifiedName = "<qualifiedName>",
-                shortDescription = "<shortDescription>",
-                lastModifiedTS = "<lastModifiedTS>",
-                guid = "<guid>",
-            };
-
-            Response response = await client.UpdateGlossaryTermAsync("<termGuid>", RequestContent.Create(data), true);
+                ["assignedEntities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+},
+                ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["relationGuid"] = "<relationGuid>",
+["status"] = "DRAFT",
+}
+},
+                ["classifies"] = new List<object>()
+{
+null
+},
+                ["examples"] = new List<object>()
+{
+"<examples>"
+},
+                ["isA"] = new List<object>()
+{
+null
+},
+                ["preferredTerms"] = new List<object>()
+{
+null
+},
+                ["preferredToTerms"] = new List<object>()
+{
+null
+},
+                ["replacedBy"] = new List<object>()
+{
+null
+},
+                ["replacementTerms"] = new List<object>()
+{
+null
+},
+                ["seeAlso"] = new List<object>()
+{
+null
+},
+                ["synonyms"] = new List<object>()
+{
+null
+},
+                ["translatedTerms"] = new List<object>()
+{
+null
+},
+                ["translationTerms"] = new List<object>()
+{
+null
+},
+                ["usage"] = "<usage>",
+                ["validValues"] = new List<object>()
+{
+null
+},
+                ["validValuesFor"] = new List<object>()
+{
+null
+},
+                ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["longDescription"] = "<longDescription>",
+                ["name"] = "<name>",
+                ["qualifiedName"] = "<qualifiedName>",
+                ["shortDescription"] = "<shortDescription>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+                ["guid"] = "<guid>",
+            });
+            Response response = await client.UpdateGlossaryTermAsync("<termGuid>", content, includeTermHierarchy: true);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -4391,20 +3376,20 @@ public async Task Example_UpdateGlossaryTerm_AllParameters_Async()
             Console.WriteLine(result.GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -4515,8 +3500,8 @@ public async Task Example_UpdateGlossaryTerm_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -4531,9 +3516,9 @@ public async Task Example_UpdateGlossaryTerm_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteGlossaryTerm()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
             Response response = client.DeleteGlossaryTerm("<termGuid>");
             Console.WriteLine(response.Status);
@@ -4543,9 +3528,9 @@ public void Example_DeleteGlossaryTerm()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteGlossaryTerm_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
             Response response = client.DeleteGlossaryTerm("<termGuid>");
             Console.WriteLine(response.Status);
@@ -4555,9 +3540,9 @@ public void Example_DeleteGlossaryTerm_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteGlossaryTerm_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
             Response response = await client.DeleteGlossaryTermAsync("<termGuid>");
             Console.WriteLine(response.Status);
@@ -4567,9 +3552,9 @@ public async Task Example_DeleteGlossaryTerm_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteGlossaryTerm_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
             Response response = await client.DeleteGlossaryTermAsync("<termGuid>");
             Console.WriteLine(response.Status);
@@ -4579,16 +3564,15 @@ public async Task Example_DeleteGlossaryTerm_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_PartialUpdateGlossaryTerm()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = "<String>",
-            };
-
-            Response response = client.PartialUpdateGlossaryTerm("<termGuid>", RequestContent.Create(data));
+                ["key"] = "<partialUpdates>",
+            });
+            Response response = client.PartialUpdateGlossaryTerm("<termGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -4598,16 +3582,15 @@ public void Example_PartialUpdateGlossaryTerm()
         [Ignore("Only validating compilation of examples")]
         public void Example_PartialUpdateGlossaryTerm_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = "<String>",
-            };
-
-            Response response = client.PartialUpdateGlossaryTerm("<termGuid>", RequestContent.Create(data), true);
+                ["key"] = "<partialUpdates>",
+            });
+            Response response = client.PartialUpdateGlossaryTerm("<termGuid>", content, includeTermHierarchy: true);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -4630,20 +3613,20 @@ public void Example_PartialUpdateGlossaryTerm_AllParameters()
             Console.WriteLine(result.GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -4754,8 +3737,8 @@ public void Example_PartialUpdateGlossaryTerm_AllParameters()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -4770,16 +3753,15 @@ public void Example_PartialUpdateGlossaryTerm_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_PartialUpdateGlossaryTerm_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = "<String>",
-            };
-
-            Response response = await client.PartialUpdateGlossaryTermAsync("<termGuid>", RequestContent.Create(data));
+                ["key"] = "<partialUpdates>",
+            });
+            Response response = await client.PartialUpdateGlossaryTermAsync("<termGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -4789,16 +3771,15 @@ public async Task Example_PartialUpdateGlossaryTerm_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_PartialUpdateGlossaryTerm_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = "<String>",
-            };
-
-            Response response = await client.PartialUpdateGlossaryTermAsync("<termGuid>", RequestContent.Create(data), true);
+                ["key"] = "<partialUpdates>",
+            });
+            Response response = await client.PartialUpdateGlossaryTermAsync("<termGuid>", content, includeTermHierarchy: true);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("abbreviation").ToString());
@@ -4821,20 +3802,20 @@ public async Task Example_PartialUpdateGlossaryTerm_AllParameters_Async()
             Console.WriteLine(result.GetProperty("status").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("displayName").ToString());
             Console.WriteLine(result.GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -4945,8 +3926,8 @@ public async Task Example_PartialUpdateGlossaryTerm_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -4961,15 +3942,15 @@ public async Task Example_PartialUpdateGlossaryTerm_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateGlossaryTerms()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new[] {
-    new {}
-};
-
-            Response response = client.CreateGlossaryTerms(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = client.CreateGlossaryTerms(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -4979,282 +3960,198 @@ public void Example_CreateGlossaryTerms()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateGlossaryTerms_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {
-        abbreviation = "<abbreviation>",
-        templateName = new[] {
-            new {}
-        },
-        anchor = new {
-            displayText = "<displayText>",
-            glossaryGuid = "<glossaryGuid>",
-            relationGuid = "<relationGuid>",
-        },
-        antonyms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        createTime = 123.45f,
-        createdBy = "<createdBy>",
-        updateTime = 123.45f,
-        updatedBy = "<updatedBy>",
-        status = "Draft",
-        resources = new[] {
-            new {
-                displayName = "<displayName>",
-                url = "<url>",
-            }
-        },
-        contacts = new {
-            key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
-        },
-        attributes = new {
-            key = new {
-                key = new {},
-            },
-        },
-        assignedEntities = new[] {
-            new {
-                displayText = "<displayText>",
-                entityStatus = "ACTIVE",
-                relationshipType = "<relationshipType>",
-                relationshipAttributes = new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                },
-                relationshipGuid = "<relationshipGuid>",
-                relationshipStatus = "ACTIVE",
-                guid = "<guid>",
-                typeName = "<typeName>",
-                uniqueAttributes = new {
-                    key = new {},
-                },
-            }
-        },
-        categories = new[] {
-            new {
-                categoryGuid = "<categoryGuid>",
-                description = "<description>",
-                displayText = "<displayText>",
-                relationGuid = "<relationGuid>",
-                status = "DRAFT",
-            }
-        },
-        classifies = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        examples = new[] {
-            "<String>"
-        },
-        isA = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        preferredTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        preferredToTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        replacedBy = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        replacementTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        seeAlso = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        synonyms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        translatedTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        translationTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        usage = "<usage>",
-        validValues = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        validValuesFor = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-        longDescription = "<longDescription>",
-        name = "<name>",
-        qualifiedName = "<qualifiedName>",
-        shortDescription = "<shortDescription>",
-        lastModifiedTS = "<lastModifiedTS>",
-        guid = "<guid>",
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.CreateGlossaryTerms(RequestContent.Create(data), true);
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["abbreviation"] = "<abbreviation>",
+["templateName"] = new List<object>()
+{
+new Dictionary<string, object>()
+},
+["anchor"] = new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["glossaryGuid"] = "<glossaryGuid>",
+["relationGuid"] = "<relationGuid>",
+},
+["antonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["status"] = "Draft",
+["resources"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["url"] = "<url>",
+}
+},
+["contacts"] = new Dictionary<string, object>()
+{
+["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+},
+["assignedEntities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+},
+["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["relationGuid"] = "<relationGuid>",
+["status"] = "DRAFT",
+}
+},
+["classifies"] = new List<object>()
+{
+null
+},
+["examples"] = new List<object>()
+{
+"<examples>"
+},
+["isA"] = new List<object>()
+{
+null
+},
+["preferredTerms"] = new List<object>()
+{
+null
+},
+["preferredToTerms"] = new List<object>()
+{
+null
+},
+["replacedBy"] = new List<object>()
+{
+null
+},
+["replacementTerms"] = new List<object>()
+{
+null
+},
+["seeAlso"] = new List<object>()
+{
+null
+},
+["synonyms"] = new List<object>()
+{
+null
+},
+["translatedTerms"] = new List<object>()
+{
+null
+},
+["translationTerms"] = new List<object>()
+{
+null
+},
+["usage"] = "<usage>",
+["validValues"] = new List<object>()
+{
+null
+},
+["validValuesFor"] = new List<object>()
+{
+null
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["longDescription"] = "<longDescription>",
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+["shortDescription"] = "<shortDescription>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+["guid"] = "<guid>",
+}
+});
+            Response response = client.CreateGlossaryTerms(content, includeTermHierarchy: true);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("abbreviation").ToString());
@@ -5277,20 +4174,20 @@ public void Example_CreateGlossaryTerms_AllParameters()
             Console.WriteLine(result[0].GetProperty("status").ToString());
             Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("displayName").ToString());
             Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -5401,8 +4298,8 @@ public void Example_CreateGlossaryTerms_AllParameters()
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -5417,15 +4314,15 @@ public void Example_CreateGlossaryTerms_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateGlossaryTerms_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new[] {
-    new {}
-};
-
-            Response response = await client.CreateGlossaryTermsAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = await client.CreateGlossaryTermsAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -5435,282 +4332,198 @@ public async Task Example_CreateGlossaryTerms_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateGlossaryTerms_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {
-        abbreviation = "<abbreviation>",
-        templateName = new[] {
-            new {}
-        },
-        anchor = new {
-            displayText = "<displayText>",
-            glossaryGuid = "<glossaryGuid>",
-            relationGuid = "<relationGuid>",
-        },
-        antonyms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        createTime = 123.45f,
-        createdBy = "<createdBy>",
-        updateTime = 123.45f,
-        updatedBy = "<updatedBy>",
-        status = "Draft",
-        resources = new[] {
-            new {
-                displayName = "<displayName>",
-                url = "<url>",
-            }
-        },
-        contacts = new {
-            key = new[] {
-                new {
-                    id = "<id>",
-                    info = "<info>",
-                }
-            },
-        },
-        attributes = new {
-            key = new {
-                key = new {},
-            },
-        },
-        assignedEntities = new[] {
-            new {
-                displayText = "<displayText>",
-                entityStatus = "ACTIVE",
-                relationshipType = "<relationshipType>",
-                relationshipAttributes = new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                },
-                relationshipGuid = "<relationshipGuid>",
-                relationshipStatus = "ACTIVE",
-                guid = "<guid>",
-                typeName = "<typeName>",
-                uniqueAttributes = new {
-                    key = new {},
-                },
-            }
-        },
-        categories = new[] {
-            new {
-                categoryGuid = "<categoryGuid>",
-                description = "<description>",
-                displayText = "<displayText>",
-                relationGuid = "<relationGuid>",
-                status = "DRAFT",
-            }
-        },
-        classifies = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        examples = new[] {
-            "<String>"
-        },
-        isA = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        preferredTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        preferredToTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        replacedBy = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        replacementTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        seeAlso = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        synonyms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        translatedTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        translationTerms = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        usage = "<usage>",
-        validValues = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        validValuesFor = new[] {
-            new {
-                description = "<description>",
-                displayText = "<displayText>",
-                expression = "<expression>",
-                relationGuid = "<relationGuid>",
-                source = "<source>",
-                status = "DRAFT",
-                steward = "<steward>",
-                termGuid = "<termGuid>",
-            }
-        },
-        classifications = new[] {
-            new {
-                entityGuid = "<entityGuid>",
-                entityStatus = "ACTIVE",
-                removePropagationsOnEntityDelete = true,
-                validityPeriods = new[] {
-                    new {
-                        endTime = "<endTime>",
-                        startTime = "<startTime>",
-                        timeZone = "<timeZone>",
-                    }
-                },
-                source = "<source>",
-                sourceDetails = new {
-                    key = new {},
-                },
-                attributes = new {
-                    key = new {},
-                },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            }
-        },
-        longDescription = "<longDescription>",
-        name = "<name>",
-        qualifiedName = "<qualifiedName>",
-        shortDescription = "<shortDescription>",
-        lastModifiedTS = "<lastModifiedTS>",
-        guid = "<guid>",
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.CreateGlossaryTermsAsync(RequestContent.Create(data), true);
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["abbreviation"] = "<abbreviation>",
+["templateName"] = new List<object>()
+{
+new Dictionary<string, object>()
+},
+["anchor"] = new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["glossaryGuid"] = "<glossaryGuid>",
+["relationGuid"] = "<relationGuid>",
+},
+["antonyms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["status"] = "Draft",
+["resources"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayName"] = "<displayName>",
+["url"] = "<url>",
+}
+},
+["contacts"] = new Dictionary<string, object>()
+{
+["key"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["info"] = "<info>",
+}
+},
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+},
+["assignedEntities"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+},
+["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["relationGuid"] = "<relationGuid>",
+["status"] = "DRAFT",
+}
+},
+["classifies"] = new List<object>()
+{
+null
+},
+["examples"] = new List<object>()
+{
+"<examples>"
+},
+["isA"] = new List<object>()
+{
+null
+},
+["preferredTerms"] = new List<object>()
+{
+null
+},
+["preferredToTerms"] = new List<object>()
+{
+null
+},
+["replacedBy"] = new List<object>()
+{
+null
+},
+["replacementTerms"] = new List<object>()
+{
+null
+},
+["seeAlso"] = new List<object>()
+{
+null
+},
+["synonyms"] = new List<object>()
+{
+null
+},
+["translatedTerms"] = new List<object>()
+{
+null
+},
+["translationTerms"] = new List<object>()
+{
+null
+},
+["usage"] = "<usage>",
+["validValues"] = new List<object>()
+{
+null
+},
+["validValuesFor"] = new List<object>()
+{
+null
+},
+["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+["longDescription"] = "<longDescription>",
+["name"] = "<name>",
+["qualifiedName"] = "<qualifiedName>",
+["shortDescription"] = "<shortDescription>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+["guid"] = "<guid>",
+}
+});
+            Response response = await client.CreateGlossaryTermsAsync(content, includeTermHierarchy: true);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("abbreviation").ToString());
@@ -5733,20 +4546,20 @@ public async Task Example_CreateGlossaryTerms_AllParameters_Async()
             Console.WriteLine(result[0].GetProperty("status").ToString());
             Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("displayName").ToString());
             Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -5857,8 +4670,8 @@ public async Task Example_CreateGlossaryTerms_AllParameters_Async()
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -5873,11 +4686,11 @@ public async Task Example_CreateGlossaryTerms_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEntitiesAssignedWithTerm()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetEntitiesAssignedWithTerm("<termGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetEntitiesAssignedWithTerm("<termGuid>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -5887,35 +4700,35 @@ public void Example_GetEntitiesAssignedWithTerm()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEntitiesAssignedWithTerm_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetEntitiesAssignedWithTerm("<termGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetEntitiesAssignedWithTerm("<termGuid>", 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("displayText").ToString());
             Console.WriteLine(result[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result[0].GetProperty("guid").ToString());
             Console.WriteLine(result[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEntitiesAssignedWithTerm_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetEntitiesAssignedWithTermAsync("<termGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetEntitiesAssignedWithTermAsync("<termGuid>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -5925,39 +4738,39 @@ public async Task Example_GetEntitiesAssignedWithTerm_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEntitiesAssignedWithTerm_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetEntitiesAssignedWithTermAsync("<termGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetEntitiesAssignedWithTermAsync("<termGuid>", 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("displayText").ToString());
             Console.WriteLine(result[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result[0].GetProperty("guid").ToString());
             Console.WriteLine(result[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_AssignTermToEntities()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new[] {
-    new {}
-};
-
-            Response response = client.AssignTermToEntities("<termGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = client.AssignTermToEntities("<termGuid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -5965,47 +4778,37 @@ public void Example_AssignTermToEntities()
         [Ignore("Only validating compilation of examples")]
         public void Example_AssignTermToEntities_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.AssignTermToEntities("<termGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+});
+            Response response = client.AssignTermToEntities("<termGuid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -6013,15 +4816,15 @@ public void Example_AssignTermToEntities_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AssignTermToEntities_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {}
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.AssignTermToEntitiesAsync("<termGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = await client.AssignTermToEntitiesAsync("<termGuid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -6029,47 +4832,37 @@ public async Task Example_AssignTermToEntities_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AssignTermToEntities_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.AssignTermToEntitiesAsync("<termGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+});
+            Response response = await client.AssignTermToEntitiesAsync("<termGuid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -6077,15 +4870,15 @@ public async Task Example_AssignTermToEntities_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_RemoveTermAssignmentFromEntities()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new[] {
-    new {}
-};
-
-            Response response = client.RemoveTermAssignmentFromEntities("<termGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = client.RemoveTermAssignmentFromEntities("<termGuid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -6093,47 +4886,37 @@ public void Example_RemoveTermAssignmentFromEntities()
         [Ignore("Only validating compilation of examples")]
         public void Example_RemoveTermAssignmentFromEntities_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.RemoveTermAssignmentFromEntities("<termGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+});
+            Response response = client.RemoveTermAssignmentFromEntities("<termGuid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -6141,15 +4924,15 @@ public void Example_RemoveTermAssignmentFromEntities_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RemoveTermAssignmentFromEntities_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {}
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.RemoveTermAssignmentFromEntitiesAsync("<termGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = await client.RemoveTermAssignmentFromEntitiesAsync("<termGuid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -6157,47 +4940,37 @@ public async Task Example_RemoveTermAssignmentFromEntities_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RemoveTermAssignmentFromEntities_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.RemoveTermAssignmentFromEntitiesAsync("<termGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+});
+            Response response = await client.RemoveTermAssignmentFromEntitiesAsync("<termGuid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -6205,15 +4978,15 @@ public async Task Example_RemoveTermAssignmentFromEntities_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTermAssignmentFromEntities()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new[] {
-    new {}
-};
-
-            Response response = client.DeleteTermAssignmentFromEntities("<termGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = client.DeleteTermAssignmentFromEntities("<termGuid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -6221,47 +4994,37 @@ public void Example_DeleteTermAssignmentFromEntities()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTermAssignmentFromEntities_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.DeleteTermAssignmentFromEntities("<termGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+});
+            Response response = client.DeleteTermAssignmentFromEntities("<termGuid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -6269,15 +5032,15 @@ public void Example_DeleteTermAssignmentFromEntities_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTermAssignmentFromEntities_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {}
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.DeleteTermAssignmentFromEntitiesAsync("<termGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+});
+            Response response = await client.DeleteTermAssignmentFromEntitiesAsync("<termGuid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -6285,47 +5048,37 @@ public async Task Example_DeleteTermAssignmentFromEntities_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTermAssignmentFromEntities_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = new[] {
-    new {
-        displayText = "<displayText>",
-        entityStatus = "ACTIVE",
-        relationshipType = "<relationshipType>",
-        relationshipAttributes = new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        },
-        relationshipGuid = "<relationshipGuid>",
-        relationshipStatus = "ACTIVE",
-        guid = "<guid>",
-        typeName = "<typeName>",
-        uniqueAttributes = new {
-            key = new {},
-        },
-    }
-};
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.DeleteTermAssignmentFromEntitiesAsync("<termGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+new Dictionary<string, object>()
+{
+["displayText"] = "<displayText>",
+["entityStatus"] = "ACTIVE",
+["relationshipType"] = "<relationshipType>",
+["relationshipAttributes"] = new Dictionary<string, object>()
+{
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+},
+["relationshipGuid"] = "<relationshipGuid>",
+["relationshipStatus"] = "ACTIVE",
+["guid"] = "<guid>",
+["typeName"] = "<typeName>",
+["uniqueAttributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+}
+});
+            Response response = await client.DeleteTermAssignmentFromEntitiesAsync("<termGuid>", content);
             Console.WriteLine(response.Status);
         }
 
@@ -6333,81 +5086,81 @@ public async Task Example_DeleteTermAssignmentFromEntities_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRelatedTerms()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetRelatedTerms("<termGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetRelatedTerms("<termGuid>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>")[0].ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRelatedTerms_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetRelatedTerms("<termGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetRelatedTerms("<termGuid>", 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("termGuid").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRelatedTerms_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetRelatedTermsAsync("<termGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetRelatedTermsAsync("<termGuid>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>")[0].ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRelatedTerms_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetRelatedTermsAsync("<termGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetRelatedTermsAsync("<termGuid>", 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("<test>")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("<key>")[0].GetProperty("termGuid").ToString());
         }
 
         [Test]
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossary()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossary("<glossaryGuid>", new RequestContext());
+            Response response = client.GetGlossary("<glossaryGuid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -6417,11 +5170,11 @@ public void Example_GetGlossary()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossary_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossary("<glossaryGuid>", new RequestContext());
+            Response response = client.GetGlossary("<glossaryGuid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -6446,8 +5199,8 @@ public void Example_GetGlossary_AllParameters()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -6462,11 +5215,11 @@ public void Example_GetGlossary_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossary_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossaryAsync("<glossaryGuid>", new RequestContext());
+            Response response = await client.GetGlossaryAsync("<glossaryGuid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -6476,11 +5229,11 @@ public async Task Example_GetGlossary_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossary_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossaryAsync("<glossaryGuid>", new RequestContext());
+            Response response = await client.GetGlossaryAsync("<glossaryGuid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -6505,8 +5258,8 @@ public async Task Example_GetGlossary_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -6521,13 +5274,12 @@ public async Task Example_GetGlossary_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateGlossary()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new { };
-
-            Response response = client.UpdateGlossary("<glossaryGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.UpdateGlossary("<glossaryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -6537,413 +5289,76 @@ public void Example_UpdateGlossary()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateGlossary_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                categoryInfo = new
-                {
-                    key = new
-                    {
-                        anchor = new
-                        {
-                            displayText = "<displayText>",
-                            glossaryGuid = "<glossaryGuid>",
-                            relationGuid = "<relationGuid>",
-                        },
-                        childrenCategories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    parentCategoryGuid = "<parentCategoryGuid>",
-                    relationGuid = "<relationGuid>",
-                }
-            },
-                        parentCategory = new
-                        {
-                            categoryGuid = "<categoryGuid>",
-                            description = "<description>",
-                            displayText = "<displayText>",
-                            parentCategoryGuid = "<parentCategoryGuid>",
-                            relationGuid = "<relationGuid>",
-                        },
-                        terms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        longDescription = "<longDescription>",
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                        shortDescription = "<shortDescription>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                        guid = "<guid>",
-                    },
-                },
-                termInfo = new
-                {
-                    key = new
-                    {
-                        abbreviation = "<abbreviation>",
-                        templateName = new[] {
-                new {}
-            },
-                        anchor = new
-                        {
-                            displayText = "<displayText>",
-                            glossaryGuid = "<glossaryGuid>",
-                            relationGuid = "<relationGuid>",
-                        },
-                        antonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        createTime = 123.45f,
-                        createdBy = "<createdBy>",
-                        updateTime = 123.45f,
-                        updatedBy = "<updatedBy>",
-                        status = "Draft",
-                        resources = new[] {
-                new {
-                    displayName = "<displayName>",
-                    url = "<url>",
-                }
-            },
-                        contacts = new
-                        {
-                            key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-                        },
-                        attributes = new
-                        {
-                            key = new
-                            {
-                                key = new { },
-                            },
-                        },
-                        assignedEntities = new[] {
-                new {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                            new {
-                                endTime = "<endTime>",
-                                startTime = "<startTime>",
-                                timeZone = "<timeZone>",
-                            }
-                        },
-                        source = "<source>",
-                        sourceDetails = new {
-                            key = new {},
-                        },
-                        attributes = new {
-                            key = new {},
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new {
-                        key = new {},
-                    },
-                }
-            },
-                        categories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    relationGuid = "<relationGuid>",
-                    status = "DRAFT",
-                }
-            },
-                        classifies = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        examples = new[] {
-                "<String>"
-            },
-                        isA = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        preferredTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        preferredToTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        replacedBy = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        replacementTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        seeAlso = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        synonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        translatedTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        translationTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        usage = "<usage>",
-                        validValues = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        validValuesFor = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        longDescription = "<longDescription>",
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                        shortDescription = "<shortDescription>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                        guid = "<guid>",
-                    },
-                },
-                categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-                language = "<language>",
-                terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                usage = "<usage>",
-                classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                longDescription = "<longDescription>",
-                name = "<name>",
-                qualifiedName = "<qualifiedName>",
-                shortDescription = "<shortDescription>",
-                lastModifiedTS = "<lastModifiedTS>",
-                guid = "<guid>",
-            };
-
-            Response response = client.UpdateGlossary("<glossaryGuid>", RequestContent.Create(data));
+                ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+                ["language"] = "<language>",
+                ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                ["usage"] = "<usage>",
+                ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["longDescription"] = "<longDescription>",
+                ["name"] = "<name>",
+                ["qualifiedName"] = "<qualifiedName>",
+                ["shortDescription"] = "<shortDescription>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+                ["guid"] = "<guid>",
+            });
+            Response response = client.UpdateGlossary("<glossaryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -6968,8 +5383,8 @@ public void Example_UpdateGlossary_AllParameters()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -6984,13 +5399,12 @@ public void Example_UpdateGlossary_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateGlossary_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new { };
-
-            Response response = await client.UpdateGlossaryAsync("<glossaryGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.UpdateGlossaryAsync("<glossaryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -7000,413 +5414,76 @@ public async Task Example_UpdateGlossary_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateGlossary_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                categoryInfo = new
-                {
-                    key = new
-                    {
-                        anchor = new
-                        {
-                            displayText = "<displayText>",
-                            glossaryGuid = "<glossaryGuid>",
-                            relationGuid = "<relationGuid>",
-                        },
-                        childrenCategories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    parentCategoryGuid = "<parentCategoryGuid>",
-                    relationGuid = "<relationGuid>",
-                }
-            },
-                        parentCategory = new
-                        {
-                            categoryGuid = "<categoryGuid>",
-                            description = "<description>",
-                            displayText = "<displayText>",
-                            parentCategoryGuid = "<parentCategoryGuid>",
-                            relationGuid = "<relationGuid>",
-                        },
-                        terms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        longDescription = "<longDescription>",
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                        shortDescription = "<shortDescription>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                        guid = "<guid>",
-                    },
-                },
-                termInfo = new
-                {
-                    key = new
-                    {
-                        abbreviation = "<abbreviation>",
-                        templateName = new[] {
-                new {}
-            },
-                        anchor = new
-                        {
-                            displayText = "<displayText>",
-                            glossaryGuid = "<glossaryGuid>",
-                            relationGuid = "<relationGuid>",
-                        },
-                        antonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        createTime = 123.45f,
-                        createdBy = "<createdBy>",
-                        updateTime = 123.45f,
-                        updatedBy = "<updatedBy>",
-                        status = "Draft",
-                        resources = new[] {
-                new {
-                    displayName = "<displayName>",
-                    url = "<url>",
-                }
-            },
-                        contacts = new
-                        {
-                            key = new[] {
-                    new {
-                        id = "<id>",
-                        info = "<info>",
-                    }
-                },
-                        },
-                        attributes = new
-                        {
-                            key = new
-                            {
-                                key = new { },
-                            },
-                        },
-                        assignedEntities = new[] {
-                new {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                            new {
-                                endTime = "<endTime>",
-                                startTime = "<startTime>",
-                                timeZone = "<timeZone>",
-                            }
-                        },
-                        source = "<source>",
-                        sourceDetails = new {
-                            key = new {},
-                        },
-                        attributes = new {
-                            key = new {},
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new {
-                        key = new {},
-                    },
-                }
-            },
-                        categories = new[] {
-                new {
-                    categoryGuid = "<categoryGuid>",
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    relationGuid = "<relationGuid>",
-                    status = "DRAFT",
-                }
-            },
-                        classifies = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        examples = new[] {
-                "<String>"
-            },
-                        isA = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        preferredTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        preferredToTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        replacedBy = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        replacementTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        seeAlso = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        synonyms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        translatedTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        translationTerms = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        usage = "<usage>",
-                        validValues = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        validValuesFor = new[] {
-                new {
-                    description = "<description>",
-                    displayText = "<displayText>",
-                    expression = "<expression>",
-                    relationGuid = "<relationGuid>",
-                    source = "<source>",
-                    status = "DRAFT",
-                    steward = "<steward>",
-                    termGuid = "<termGuid>",
-                }
-            },
-                        classifications = new[] {
-                new {
-                    entityGuid = "<entityGuid>",
-                    entityStatus = "ACTIVE",
-                    removePropagationsOnEntityDelete = true,
-                    validityPeriods = new[] {
-                        new {
-                            endTime = "<endTime>",
-                            startTime = "<startTime>",
-                            timeZone = "<timeZone>",
-                        }
-                    },
-                    source = "<source>",
-                    sourceDetails = new {
-                        key = new {},
-                    },
-                    attributes = new {
-                        key = new {},
-                    },
-                    typeName = "<typeName>",
-                    lastModifiedTS = "<lastModifiedTS>",
-                }
-            },
-                        longDescription = "<longDescription>",
-                        name = "<name>",
-                        qualifiedName = "<qualifiedName>",
-                        shortDescription = "<shortDescription>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                        guid = "<guid>",
-                    },
-                },
-                categories = new[] {
-        new {
-            categoryGuid = "<categoryGuid>",
-            description = "<description>",
-            displayText = "<displayText>",
-            parentCategoryGuid = "<parentCategoryGuid>",
-            relationGuid = "<relationGuid>",
-        }
-    },
-                language = "<language>",
-                terms = new[] {
-        new {
-            description = "<description>",
-            displayText = "<displayText>",
-            expression = "<expression>",
-            relationGuid = "<relationGuid>",
-            source = "<source>",
-            status = "DRAFT",
-            steward = "<steward>",
-            termGuid = "<termGuid>",
-        }
-    },
-                usage = "<usage>",
-                classifications = new[] {
-        new {
-            entityGuid = "<entityGuid>",
-            entityStatus = "ACTIVE",
-            removePropagationsOnEntityDelete = true,
-            validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-            source = "<source>",
-            sourceDetails = new {
-                key = new {},
-            },
-            attributes = new {
-                key = new {},
-            },
-            typeName = "<typeName>",
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                longDescription = "<longDescription>",
-                name = "<name>",
-                qualifiedName = "<qualifiedName>",
-                shortDescription = "<shortDescription>",
-                lastModifiedTS = "<lastModifiedTS>",
-                guid = "<guid>",
-            };
-
-            Response response = await client.UpdateGlossaryAsync("<glossaryGuid>", RequestContent.Create(data));
+                ["categories"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["categoryGuid"] = "<categoryGuid>",
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["parentCategoryGuid"] = "<parentCategoryGuid>",
+["relationGuid"] = "<relationGuid>",
+}
+},
+                ["language"] = "<language>",
+                ["terms"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["displayText"] = "<displayText>",
+["expression"] = "<expression>",
+["relationGuid"] = "<relationGuid>",
+["source"] = "<source>",
+["status"] = "DRAFT",
+["steward"] = "<steward>",
+["termGuid"] = "<termGuid>",
+}
+},
+                ["usage"] = "<usage>",
+                ["classifications"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityGuid"] = "<entityGuid>",
+["entityStatus"] = "ACTIVE",
+["removePropagationsOnEntityDelete"] = true,
+["validityPeriods"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endTime"] = "<endTime>",
+["startTime"] = "<startTime>",
+["timeZone"] = "<timeZone>",
+}
+},
+["source"] = "<source>",
+["sourceDetails"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["attributes"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["typeName"] = "<typeName>",
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["longDescription"] = "<longDescription>",
+                ["name"] = "<name>",
+                ["qualifiedName"] = "<qualifiedName>",
+                ["shortDescription"] = "<shortDescription>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+                ["guid"] = "<guid>",
+            });
+            Response response = await client.UpdateGlossaryAsync("<glossaryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -7431,8 +5508,8 @@ public async Task Example_UpdateGlossary_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -7447,9 +5524,9 @@ public async Task Example_UpdateGlossary_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteGlossary()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
             Response response = client.DeleteGlossary("<glossaryGuid>");
             Console.WriteLine(response.Status);
@@ -7459,9 +5536,9 @@ public void Example_DeleteGlossary()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteGlossary_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
             Response response = client.DeleteGlossary("<glossaryGuid>");
             Console.WriteLine(response.Status);
@@ -7471,9 +5548,9 @@ public void Example_DeleteGlossary_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteGlossary_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
             Response response = await client.DeleteGlossaryAsync("<glossaryGuid>");
             Console.WriteLine(response.Status);
@@ -7483,9 +5560,9 @@ public async Task Example_DeleteGlossary_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteGlossary_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
             Response response = await client.DeleteGlossaryAsync("<glossaryGuid>");
             Console.WriteLine(response.Status);
@@ -7495,11 +5572,11 @@ public async Task Example_DeleteGlossary_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossaryCategories()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossaryCategories("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetGlossaryCategories("<glossaryGuid>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -7509,11 +5586,11 @@ public void Example_GetGlossaryCategories()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossaryCategories_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossaryCategories("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetGlossaryCategories("<glossaryGuid>", 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("anchor").GetProperty("displayText").ToString());
@@ -7544,8 +5621,8 @@ public void Example_GetGlossaryCategories_AllParameters()
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -7560,11 +5637,11 @@ public void Example_GetGlossaryCategories_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossaryCategories_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossaryCategoriesAsync("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetGlossaryCategoriesAsync("<glossaryGuid>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -7574,11 +5651,11 @@ public async Task Example_GetGlossaryCategories_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossaryCategories_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossaryCategoriesAsync("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetGlossaryCategoriesAsync("<glossaryGuid>", 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("anchor").GetProperty("displayText").ToString());
@@ -7609,8 +5686,8 @@ public async Task Example_GetGlossaryCategories_AllParameters_Async()
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -7625,11 +5702,11 @@ public async Task Example_GetGlossaryCategories_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossaryCategoriesHeaders()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossaryCategoriesHeaders("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetGlossaryCategoriesHeaders("<glossaryGuid>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -7639,11 +5716,11 @@ public void Example_GetGlossaryCategoriesHeaders()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossaryCategoriesHeaders_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossaryCategoriesHeaders("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetGlossaryCategoriesHeaders("<glossaryGuid>", 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("categoryGuid").ToString());
@@ -7657,11 +5734,11 @@ public void Example_GetGlossaryCategoriesHeaders_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossaryCategoriesHeaders_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossaryCategoriesHeadersAsync("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetGlossaryCategoriesHeadersAsync("<glossaryGuid>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -7671,11 +5748,11 @@ public async Task Example_GetGlossaryCategoriesHeaders_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossaryCategoriesHeaders_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossaryCategoriesHeadersAsync("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetGlossaryCategoriesHeadersAsync("<glossaryGuid>", 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("categoryGuid").ToString());
@@ -7689,11 +5766,11 @@ public async Task Example_GetGlossaryCategoriesHeaders_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDetailedGlossary()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetDetailedGlossary("<glossaryGuid>", true, new RequestContext());
+            Response response = client.GetDetailedGlossary("<glossaryGuid>", null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -7703,205 +5780,205 @@ public void Example_GetDetailedGlossary()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDetailedGlossary_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetDetailedGlossary("<glossaryGuid>", true, new RequestContext());
+            Response response = client.GetDetailedGlossary("<glossaryGuid>", true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("categoryGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("parentCategoryGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("categoryGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("parentCategoryGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("longDescription").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("qualifiedName").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("shortDescription").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("abbreviation").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("templateName")[0].ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("createTime").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("updateTime").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("updatedBy").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("resources")[0].GetProperty("displayName").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("examples")[0].ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("usage").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("longDescription").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("qualifiedName").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("shortDescription").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("categoryGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("parentCategoryGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("categoryGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("parentCategoryGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("longDescription").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("name").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("qualifiedName").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("shortDescription").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("abbreviation").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("templateName")[0].ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("createTime").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("updateTime").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("updatedBy").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("resources")[0].GetProperty("displayName").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("resources")[0].GetProperty("url").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("examples")[0].ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("usage").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("longDescription").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("name").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("qualifiedName").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("shortDescription").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -7924,8 +6001,8 @@ public void Example_GetDetailedGlossary_AllParameters()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -7940,11 +6017,11 @@ public void Example_GetDetailedGlossary_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDetailedGlossary_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetDetailedGlossaryAsync("<glossaryGuid>", true, new RequestContext());
+            Response response = await client.GetDetailedGlossaryAsync("<glossaryGuid>", null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -7954,205 +6031,205 @@ public async Task Example_GetDetailedGlossary_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDetailedGlossary_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetDetailedGlossaryAsync("<glossaryGuid>", true, new RequestContext());
+            Response response = await client.GetDetailedGlossaryAsync("<glossaryGuid>", true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("categoryGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("parentCategoryGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("childrenCategories")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("categoryGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("parentCategoryGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("parentCategory").GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("terms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("longDescription").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("qualifiedName").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("shortDescription").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("abbreviation").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("templateName")[0].ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("anchor").GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("antonyms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("createTime").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("updateTime").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("updatedBy").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("resources")[0].GetProperty("displayName").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("categories")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifies")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("examples")[0].ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("isA")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredTerms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("preferredToTerms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacedBy")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("replacementTerms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("seeAlso")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("synonyms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translatedTerms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("translationTerms")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("usage").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValues")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("validValuesFor")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("longDescription").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("qualifiedName").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("shortDescription").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<test>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("categoryGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("parentCategoryGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("childrenCategories")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("categoryGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("parentCategoryGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("parentCategory").GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("terms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("longDescription").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("name").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("qualifiedName").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("shortDescription").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("categoryInfo").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("abbreviation").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("templateName")[0].ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("glossaryGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("anchor").GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("antonyms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("createTime").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("updateTime").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("updatedBy").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("resources")[0].GetProperty("displayName").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("resources")[0].GetProperty("url").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("categories")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifies")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("examples")[0].ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("isA")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredTerms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("preferredToTerms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacedBy")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("replacementTerms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("seeAlso")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("synonyms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translatedTerms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("translationTerms")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("usage").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValues")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("validValuesFor")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("longDescription").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("name").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("qualifiedName").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("shortDescription").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("termInfo").GetProperty("<key>").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -8175,8 +6252,8 @@ public async Task Example_GetDetailedGlossary_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -8191,16 +6268,15 @@ public async Task Example_GetDetailedGlossary_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_PartialUpdateGlossary()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = "<String>",
-            };
-
-            Response response = client.PartialUpdateGlossary("<glossaryGuid>", RequestContent.Create(data));
+                ["key"] = "<partialUpdates>",
+            });
+            Response response = client.PartialUpdateGlossary("<glossaryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -8210,16 +6286,15 @@ public void Example_PartialUpdateGlossary()
         [Ignore("Only validating compilation of examples")]
         public void Example_PartialUpdateGlossary_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = "<String>",
-            };
-
-            Response response = client.PartialUpdateGlossary("<glossaryGuid>", RequestContent.Create(data), true);
+                ["key"] = "<partialUpdates>",
+            });
+            Response response = client.PartialUpdateGlossary("<glossaryGuid>", content, includeTermHierarchy: true);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -8244,8 +6319,8 @@ public void Example_PartialUpdateGlossary_AllParameters()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -8260,16 +6335,15 @@ public void Example_PartialUpdateGlossary_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_PartialUpdateGlossary_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = "<String>",
-            };
-
-            Response response = await client.PartialUpdateGlossaryAsync("<glossaryGuid>", RequestContent.Create(data));
+                ["key"] = "<partialUpdates>",
+            });
+            Response response = await client.PartialUpdateGlossaryAsync("<glossaryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -8279,16 +6353,15 @@ public async Task Example_PartialUpdateGlossary_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_PartialUpdateGlossary_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                key = "<String>",
-            };
-
-            Response response = await client.PartialUpdateGlossaryAsync("<glossaryGuid>", RequestContent.Create(data), true);
+                ["key"] = "<partialUpdates>",
+            });
+            Response response = await client.PartialUpdateGlossaryAsync("<glossaryGuid>", content, includeTermHierarchy: true);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
@@ -8313,8 +6386,8 @@ public async Task Example_PartialUpdateGlossary_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("longDescription").ToString());
@@ -8329,11 +6402,11 @@ public async Task Example_PartialUpdateGlossary_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossaryTerms()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossaryTerms("<glossaryGuid>", true, 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetGlossaryTerms("<glossaryGuid>", null, null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -8343,11 +6416,11 @@ public void Example_GetGlossaryTerms()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossaryTerms_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossaryTerms("<glossaryGuid>", true, 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetGlossaryTerms("<glossaryGuid>", true, 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("abbreviation").ToString());
@@ -8370,20 +6443,20 @@ public void Example_GetGlossaryTerms_AllParameters()
             Console.WriteLine(result[0].GetProperty("status").ToString());
             Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("displayName").ToString());
             Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -8494,8 +6567,8 @@ public void Example_GetGlossaryTerms_AllParameters()
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -8510,11 +6583,11 @@ public void Example_GetGlossaryTerms_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossaryTerms_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossaryTermsAsync("<glossaryGuid>", true, 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetGlossaryTermsAsync("<glossaryGuid>", null, null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -8524,11 +6597,11 @@ public async Task Example_GetGlossaryTerms_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossaryTerms_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossaryTermsAsync("<glossaryGuid>", true, 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetGlossaryTermsAsync("<glossaryGuid>", true, 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("abbreviation").ToString());
@@ -8551,20 +6624,20 @@ public async Task Example_GetGlossaryTerms_AllParameters_Async()
             Console.WriteLine(result[0].GetProperty("status").ToString());
             Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("displayName").ToString());
             Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -8675,8 +6748,8 @@ public async Task Example_GetGlossaryTerms_AllParameters_Async()
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -8691,11 +6764,11 @@ public async Task Example_GetGlossaryTerms_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossaryTermHeaders()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossaryTermHeaders("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetGlossaryTermHeaders("<glossaryGuid>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -8705,11 +6778,11 @@ public void Example_GetGlossaryTermHeaders()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetGlossaryTermHeaders_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetGlossaryTermHeaders("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = client.GetGlossaryTermHeaders("<glossaryGuid>", 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("description").ToString());
@@ -8726,11 +6799,11 @@ public void Example_GetGlossaryTermHeaders_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossaryTermHeaders_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossaryTermHeadersAsync("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetGlossaryTermHeadersAsync("<glossaryGuid>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -8740,11 +6813,11 @@ public async Task Example_GetGlossaryTermHeaders_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetGlossaryTermHeaders_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetGlossaryTermHeadersAsync("<glossaryGuid>", 1234, 1234, "<sort>", new RequestContext());
+            Response response = await client.GetGlossaryTermHeadersAsync("<glossaryGuid>", 1234, 1234, "<sort>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("description").ToString());
@@ -8761,11 +6834,11 @@ public async Task Example_GetGlossaryTermHeaders_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetImportCsvOperationStatus()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetImportCsvOperationStatus("<operationGuid>", new RequestContext());
+            Response response = client.GetImportCsvOperationStatus("<operationGuid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -8775,11 +6848,11 @@ public void Example_GetImportCsvOperationStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetImportCsvOperationStatus_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetImportCsvOperationStatus("<operationGuid>", new RequestContext());
+            Response response = client.GetImportCsvOperationStatus("<operationGuid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -8796,11 +6869,11 @@ public void Example_GetImportCsvOperationStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetImportCsvOperationStatus_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetImportCsvOperationStatusAsync("<operationGuid>", new RequestContext());
+            Response response = await client.GetImportCsvOperationStatusAsync("<operationGuid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -8810,11 +6883,11 @@ public async Task Example_GetImportCsvOperationStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetImportCsvOperationStatus_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetImportCsvOperationStatusAsync("<operationGuid>", new RequestContext());
+            Response response = await client.GetImportCsvOperationStatusAsync("<operationGuid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -8831,15 +6904,15 @@ public async Task Example_GetImportCsvOperationStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_ExportGlossaryTermsAsCsv()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = client.ExportGlossaryTermsAsCsv("<glossaryGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<termGuids>"
+});
+            Response response = client.ExportGlossaryTermsAsCsv("<glossaryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -8849,15 +6922,15 @@ public void Example_ExportGlossaryTermsAsCsv()
         [Ignore("Only validating compilation of examples")]
         public void Example_ExportGlossaryTermsAsCsv_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = client.ExportGlossaryTermsAsCsv("<glossaryGuid>", RequestContent.Create(data), true);
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<termGuids>"
+});
+            Response response = client.ExportGlossaryTermsAsCsv("<glossaryGuid>", content, includeTermHierarchy: true);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -8867,15 +6940,15 @@ public void Example_ExportGlossaryTermsAsCsv_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ExportGlossaryTermsAsCsv_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = await client.ExportGlossaryTermsAsCsvAsync("<glossaryGuid>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<termGuids>"
+});
+            Response response = await client.ExportGlossaryTermsAsCsvAsync("<glossaryGuid>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -8885,15 +6958,15 @@ public async Task Example_ExportGlossaryTermsAsCsv_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ExportGlossaryTermsAsCsv_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            var data = new[] {
-    "<String>"
-};
-
-            Response response = await client.ExportGlossaryTermsAsCsvAsync("<glossaryGuid>", RequestContent.Create(data), true);
+            RequestContent content = RequestContent.Create(new List<object>()
+{
+"<termGuids>"
+});
+            Response response = await client.ExportGlossaryTermsAsCsvAsync("<glossaryGuid>", content, includeTermHierarchy: true);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -8903,11 +6976,11 @@ public async Task Example_ExportGlossaryTermsAsCsv_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTermsByGlossaryName()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetTermsByGlossaryName("<glossaryName>", 1234, 1234, true, new RequestContext());
+            Response response = client.GetTermsByGlossaryName("<glossaryName>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -8917,11 +6990,11 @@ public void Example_GetTermsByGlossaryName()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTermsByGlossaryName_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = client.GetTermsByGlossaryName("<glossaryName>", 1234, 1234, true, new RequestContext());
+            Response response = client.GetTermsByGlossaryName("<glossaryName>", 1234, 1234, true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("abbreviation").ToString());
@@ -8944,20 +7017,20 @@ public void Example_GetTermsByGlossaryName_AllParameters()
             Console.WriteLine(result[0].GetProperty("status").ToString());
             Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("displayName").ToString());
             Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -9068,8 +7141,8 @@ public void Example_GetTermsByGlossaryName_AllParameters()
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -9084,11 +7157,11 @@ public void Example_GetTermsByGlossaryName_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTermsByGlossaryName_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetTermsByGlossaryNameAsync("<glossaryName>", 1234, 1234, true, new RequestContext());
+            Response response = await client.GetTermsByGlossaryNameAsync("<glossaryName>", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -9098,11 +7171,11 @@ public async Task Example_GetTermsByGlossaryName_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTermsByGlossaryName_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
-            Response response = await client.GetTermsByGlossaryNameAsync("<glossaryName>", 1234, 1234, true, new RequestContext());
+            Response response = await client.GetTermsByGlossaryNameAsync("<glossaryName>", 1234, 1234, true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("abbreviation").ToString());
@@ -9125,20 +7198,20 @@ public async Task Example_GetTermsByGlossaryName_AllParameters_Async()
             Console.WriteLine(result[0].GetProperty("status").ToString());
             Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("displayName").ToString());
             Console.WriteLine(result[0].GetProperty("resources")[0].GetProperty("url").ToString());
-            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("id").ToString());
-            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<test>")[0].GetProperty("info").ToString());
-            Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("id").ToString());
+            Console.WriteLine(result[0].GetProperty("contacts").GetProperty("<key>")[0].GetProperty("info").ToString());
+            Console.WriteLine(result[0].GetProperty("attributes").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("displayText").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("entityStatus").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipType").ToString());
-            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipAttributes").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipGuid").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("relationshipStatus").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("guid").ToString());
             Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("assignedEntities")[0].GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("categoryGuid").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("description").ToString());
             Console.WriteLine(result[0].GetProperty("categories")[0].GetProperty("displayText").ToString());
@@ -9249,8 +7322,8 @@ public async Task Example_GetTermsByGlossaryName_AllParameters_Async()
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result[0].GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result[0].GetProperty("longDescription").ToString());
@@ -9265,15 +7338,14 @@ public async Task Example_GetTermsByGlossaryName_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_ImportGlossaryTermsViaCsv()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = File.OpenRead("<filePath>");
-
-            var operation = client.ImportGlossaryTermsViaCsv(WaitUntil.Completed, "<glossaryGuid>", RequestContent.Create(data));
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Operation<BinaryData> operation = client.ImportGlossaryTermsViaCsv(WaitUntil.Completed, "<glossaryGuid>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.ToString());
         }
@@ -9282,15 +7354,14 @@ public void Example_ImportGlossaryTermsViaCsv()
         [Ignore("Only validating compilation of examples")]
         public void Example_ImportGlossaryTermsViaCsv_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = File.OpenRead("<filePath>");
-
-            var operation = client.ImportGlossaryTermsViaCsv(WaitUntil.Completed, "<glossaryGuid>", RequestContent.Create(data), true);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Operation<BinaryData> operation = client.ImportGlossaryTermsViaCsv(WaitUntil.Completed, "<glossaryGuid>", content, includeTermHierarchy: true);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -9306,15 +7377,14 @@ public void Example_ImportGlossaryTermsViaCsv_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ImportGlossaryTermsViaCsv_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = File.OpenRead("<filePath>");
-
-            var operation = await client.ImportGlossaryTermsViaCsvAsync(WaitUntil.Completed, "<glossaryGuid>", RequestContent.Create(data));
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Operation<BinaryData> operation = await client.ImportGlossaryTermsViaCsvAsync(WaitUntil.Completed, "<glossaryGuid>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.ToString());
         }
@@ -9323,15 +7393,14 @@ public async Task Example_ImportGlossaryTermsViaCsv_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ImportGlossaryTermsViaCsv_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = File.OpenRead("<filePath>");
-
-            var operation = await client.ImportGlossaryTermsViaCsvAsync(WaitUntil.Completed, "<glossaryGuid>", RequestContent.Create(data), true);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Operation<BinaryData> operation = await client.ImportGlossaryTermsViaCsvAsync(WaitUntil.Completed, "<glossaryGuid>", content, includeTermHierarchy: true);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -9347,15 +7416,14 @@ public async Task Example_ImportGlossaryTermsViaCsv_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_ImportGlossaryTermsViaCsvByGlossaryName()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = File.OpenRead("<filePath>");
-
-            var operation = client.ImportGlossaryTermsViaCsvByGlossaryName(WaitUntil.Completed, "<glossaryName>", RequestContent.Create(data));
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Operation<BinaryData> operation = client.ImportGlossaryTermsViaCsvByGlossaryName(WaitUntil.Completed, "<glossaryName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.ToString());
         }
@@ -9364,15 +7432,14 @@ public void Example_ImportGlossaryTermsViaCsvByGlossaryName()
         [Ignore("Only validating compilation of examples")]
         public void Example_ImportGlossaryTermsViaCsvByGlossaryName_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = File.OpenRead("<filePath>");
-
-            var operation = client.ImportGlossaryTermsViaCsvByGlossaryName(WaitUntil.Completed, "<glossaryName>", RequestContent.Create(data), true);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Operation<BinaryData> operation = client.ImportGlossaryTermsViaCsvByGlossaryName(WaitUntil.Completed, "<glossaryName>", content, includeTermHierarchy: true);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
@@ -9388,15 +7455,14 @@ public void Example_ImportGlossaryTermsViaCsvByGlossaryName_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ImportGlossaryTermsViaCsvByGlossaryName_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = File.OpenRead("<filePath>");
-
-            var operation = await client.ImportGlossaryTermsViaCsvByGlossaryNameAsync(WaitUntil.Completed, "<glossaryName>", RequestContent.Create(data));
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Operation<BinaryData> operation = await client.ImportGlossaryTermsViaCsvByGlossaryNameAsync(WaitUntil.Completed, "<glossaryName>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.ToString());
         }
@@ -9405,15 +7471,14 @@ public async Task Example_ImportGlossaryTermsViaCsvByGlossaryName_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ImportGlossaryTermsViaCsvByGlossaryName_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
-
-            var data = File.OpenRead("<filePath>");
-
-            var operation = await client.ImportGlossaryTermsViaCsvByGlossaryNameAsync(WaitUntil.Completed, "<glossaryName>", RequestContent.Create(data), true);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewGlossaries client = new PurviewCatalogClient(endpoint, credential).GetPurviewGlossariesClient();
 
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Operation<BinaryData> operation = await client.ImportGlossaryTermsViaCsvByGlossaryNameAsync(WaitUntil.Completed, "<glossaryName>", content, includeTermHierarchy: true);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("status").ToString());
diff --git a/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewLineages.cs b/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewLineages.cs
index 6e4343c033cb..407fa1a2c367 100644
--- a/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewLineages.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewLineages.cs
@@ -6,11 +6,10 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Catalog;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +22,11 @@ internal class Samples_PurviewLineages
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLineageGraph()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-            Response response = client.GetLineageGraph("<guid>", "<direction>", 1234, 1234, true, true, new RequestContext());
+            Response response = client.GetLineageGraph("<guid>", "BOTH", null, null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -37,46 +36,46 @@ public void Example_GetLineageGraph()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLineageGraph_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-            Response response = client.GetLineageGraph("<guid>", "<direction>", 1234, 1234, true, true, new RequestContext());
+            Response response = client.GetLineageGraph("<guid>", "BOTH", 1234, 1234, true, true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("baseEntityGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("lineageDepth").ToString());
             Console.WriteLine(result.GetProperty("lineageWidth").ToString());
             Console.WriteLine(result.GetProperty("includeParent").ToString());
@@ -94,11 +93,11 @@ public void Example_GetLineageGraph_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLineageGraph_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-            Response response = await client.GetLineageGraphAsync("<guid>", "<direction>", 1234, 1234, true, true, new RequestContext());
+            Response response = await client.GetLineageGraphAsync("<guid>", "BOTH", null, null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -108,46 +107,46 @@ public async Task Example_GetLineageGraph_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLineageGraph_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-            Response response = await client.GetLineageGraphAsync("<guid>", "<direction>", 1234, 1234, true, true, new RequestContext());
+            Response response = await client.GetLineageGraphAsync("<guid>", "BOTH", 1234, 1234, true, true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("baseEntityGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("lineageDepth").ToString());
             Console.WriteLine(result.GetProperty("lineageWidth").ToString());
             Console.WriteLine(result.GetProperty("includeParent").ToString());
@@ -165,11 +164,11 @@ public async Task Example_GetLineageGraph_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_NextPageLineage()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-            Response response = client.NextPageLineage("<guid>", "<direction>", true, 1234, 1234, new RequestContext());
+            Response response = client.NextPageLineage("<guid>", "BOTH", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -179,46 +178,46 @@ public void Example_NextPageLineage()
         [Ignore("Only validating compilation of examples")]
         public void Example_NextPageLineage_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-            Response response = client.NextPageLineage("<guid>", "<direction>", true, 1234, 1234, new RequestContext());
+            Response response = client.NextPageLineage("<guid>", "BOTH", true, 1234, 1234, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("baseEntityGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("lineageDepth").ToString());
             Console.WriteLine(result.GetProperty("lineageWidth").ToString());
             Console.WriteLine(result.GetProperty("includeParent").ToString());
@@ -236,11 +235,11 @@ public void Example_NextPageLineage_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_NextPageLineage_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-            Response response = await client.NextPageLineageAsync("<guid>", "<direction>", true, 1234, 1234, new RequestContext());
+            Response response = await client.NextPageLineageAsync("<guid>", "BOTH", null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -250,46 +249,46 @@ public async Task Example_NextPageLineage_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_NextPageLineage_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-            Response response = await client.NextPageLineageAsync("<guid>", "<direction>", true, 1234, 1234, new RequestContext());
+            Response response = await client.NextPageLineageAsync("<guid>", "BOTH", true, 1234, 1234, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("baseEntityGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("lineageDepth").ToString());
             Console.WriteLine(result.GetProperty("lineageWidth").ToString());
             Console.WriteLine(result.GetProperty("includeParent").ToString());
@@ -307,11 +306,11 @@ public async Task Example_NextPageLineage_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLineageByUniqueAttribute()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-            Response response = client.GetLineageByUniqueAttribute("<typeName>", "<direction>", 1234, 1234, true, true, new RequestContext());
+            Response response = client.GetLineageByUniqueAttribute("<typeName>", "BOTH", null, null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -321,46 +320,46 @@ public void Example_GetLineageByUniqueAttribute()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLineageByUniqueAttribute_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-            Response response = client.GetLineageByUniqueAttribute("<typeName>", "<direction>", 1234, 1234, true, true, new RequestContext());
+            Response response = client.GetLineageByUniqueAttribute("<typeName>", "BOTH", 1234, 1234, true, true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("baseEntityGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("lineageDepth").ToString());
             Console.WriteLine(result.GetProperty("lineageWidth").ToString());
             Console.WriteLine(result.GetProperty("includeParent").ToString());
@@ -378,11 +377,11 @@ public void Example_GetLineageByUniqueAttribute_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLineageByUniqueAttribute_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-            Response response = await client.GetLineageByUniqueAttributeAsync("<typeName>", "<direction>", 1234, 1234, true, true, new RequestContext());
+            Response response = await client.GetLineageByUniqueAttributeAsync("<typeName>", "BOTH", null, null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -392,46 +391,46 @@ public async Task Example_GetLineageByUniqueAttribute_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLineageByUniqueAttribute_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewLineages client = new PurviewCatalogClient(endpoint, credential).GetPurviewLineagesClient();
 
-            Response response = await client.GetLineageByUniqueAttributeAsync("<typeName>", "<direction>", 1234, 1234, true, true, new RequestContext());
+            Response response = await client.GetLineageByUniqueAttributeAsync("<typeName>", "BOTH", 1234, 1234, true, true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("baseEntityGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<test>").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("guidEntityMap").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("widthCounts").GetProperty("<key>").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("lineageDepth").ToString());
             Console.WriteLine(result.GetProperty("lineageWidth").ToString());
             Console.WriteLine(result.GetProperty("includeParent").ToString());
diff --git a/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewRelationships.cs b/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewRelationships.cs
index b3758165686e..54a67c5a539b 100644
--- a/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewRelationships.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewRelationships.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Catalog;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,13 +23,12 @@ internal class Samples_PurviewRelationships
         [Ignore("Only validating compilation of examples")]
         public void Example_Create()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-            var data = new { };
-
-            Response response = client.Create(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.Create(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -39,117 +38,51 @@ public void Example_Create()
         [Ignore("Only validating compilation of examples")]
         public void Example_Create_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                createTime = 123.45f,
-                createdBy = "<createdBy>",
-                end1 = new
-                {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new
-                    {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new
-                    {
-                        key = new { },
-                    },
-                },
-                end2 = new
+                ["createTime"] = 123.45F,
+                ["createdBy"] = "<createdBy>",
+                ["end1"] = new Dictionary<string, object>()
                 {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new
+                    ["guid"] = "<guid>",
+                    ["typeName"] = "<typeName>",
+                    ["uniqueAttributes"] = new Dictionary<string, object>()
                     {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new
-                    {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
                 },
-                guid = "<guid>",
-                homeId = "<homeId>",
-                label = "<label>",
-                provenanceType = 123.45f,
-                status = "ACTIVE",
-                updateTime = 123.45f,
-                updatedBy = "<updatedBy>",
-                version = 123.45f,
-                attributes = new
+                ["end2"] = null
+            ,
+                ["guid"] = "<guid>",
+                ["homeId"] = "<homeId>",
+                ["label"] = "<label>",
+                ["provenanceType"] = 123.45F,
+                ["status"] = "ACTIVE",
+                ["updateTime"] = 123.45F,
+                ["updatedBy"] = "<updatedBy>",
+                ["version"] = 123.45F,
+                ["attributes"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            };
-
-            Response response = client.Create(RequestContent.Create(data));
+                ["typeName"] = "<typeName>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+            });
+            Response response = client.Create(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("createTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("end1").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("end1").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("end2").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("end2").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("homeId").ToString());
             Console.WriteLine(result.GetProperty("label").ToString());
@@ -158,7 +91,7 @@ public void Example_Create_AllParameters()
             Console.WriteLine(result.GetProperty("updateTime").ToString());
             Console.WriteLine(result.GetProperty("updatedBy").ToString());
             Console.WriteLine(result.GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
         }
@@ -167,13 +100,12 @@ public void Example_Create_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Create_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-            var data = new { };
-
-            Response response = await client.CreateAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -183,117 +115,51 @@ public async Task Example_Create_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Create_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                createTime = 123.45f,
-                createdBy = "<createdBy>",
-                end1 = new
-                {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new
-                    {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new
-                    {
-                        key = new { },
-                    },
-                },
-                end2 = new
+                ["createTime"] = 123.45F,
+                ["createdBy"] = "<createdBy>",
+                ["end1"] = new Dictionary<string, object>()
                 {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new
+                    ["guid"] = "<guid>",
+                    ["typeName"] = "<typeName>",
+                    ["uniqueAttributes"] = new Dictionary<string, object>()
                     {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new
-                    {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
                 },
-                guid = "<guid>",
-                homeId = "<homeId>",
-                label = "<label>",
-                provenanceType = 123.45f,
-                status = "ACTIVE",
-                updateTime = 123.45f,
-                updatedBy = "<updatedBy>",
-                version = 123.45f,
-                attributes = new
+                ["end2"] = null
+            ,
+                ["guid"] = "<guid>",
+                ["homeId"] = "<homeId>",
+                ["label"] = "<label>",
+                ["provenanceType"] = 123.45F,
+                ["status"] = "ACTIVE",
+                ["updateTime"] = 123.45F,
+                ["updatedBy"] = "<updatedBy>",
+                ["version"] = 123.45F,
+                ["attributes"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            };
-
-            Response response = await client.CreateAsync(RequestContent.Create(data));
+                ["typeName"] = "<typeName>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+            });
+            Response response = await client.CreateAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("createTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("end1").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("end1").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("end2").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("end2").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("homeId").ToString());
             Console.WriteLine(result.GetProperty("label").ToString());
@@ -302,7 +168,7 @@ public async Task Example_Create_AllParameters_Async()
             Console.WriteLine(result.GetProperty("updateTime").ToString());
             Console.WriteLine(result.GetProperty("updatedBy").ToString());
             Console.WriteLine(result.GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
         }
@@ -311,13 +177,12 @@ public async Task Example_Create_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_Update()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-            var data = new { };
-
-            Response response = client.Update(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.Update(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -327,117 +192,51 @@ public void Example_Update()
         [Ignore("Only validating compilation of examples")]
         public void Example_Update_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                createTime = 123.45f,
-                createdBy = "<createdBy>",
-                end1 = new
-                {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new
-                    {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new
-                    {
-                        key = new { },
-                    },
-                },
-                end2 = new
+                ["createTime"] = 123.45F,
+                ["createdBy"] = "<createdBy>",
+                ["end1"] = new Dictionary<string, object>()
                 {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new
+                    ["guid"] = "<guid>",
+                    ["typeName"] = "<typeName>",
+                    ["uniqueAttributes"] = new Dictionary<string, object>()
                     {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new
-                    {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
                 },
-                guid = "<guid>",
-                homeId = "<homeId>",
-                label = "<label>",
-                provenanceType = 123.45f,
-                status = "ACTIVE",
-                updateTime = 123.45f,
-                updatedBy = "<updatedBy>",
-                version = 123.45f,
-                attributes = new
+                ["end2"] = null
+            ,
+                ["guid"] = "<guid>",
+                ["homeId"] = "<homeId>",
+                ["label"] = "<label>",
+                ["provenanceType"] = 123.45F,
+                ["status"] = "ACTIVE",
+                ["updateTime"] = 123.45F,
+                ["updatedBy"] = "<updatedBy>",
+                ["version"] = 123.45F,
+                ["attributes"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            };
-
-            Response response = client.Update(RequestContent.Create(data));
+                ["typeName"] = "<typeName>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+            });
+            Response response = client.Update(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("createTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("end1").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("end1").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("end2").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("end2").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("homeId").ToString());
             Console.WriteLine(result.GetProperty("label").ToString());
@@ -446,7 +245,7 @@ public void Example_Update_AllParameters()
             Console.WriteLine(result.GetProperty("updateTime").ToString());
             Console.WriteLine(result.GetProperty("updatedBy").ToString());
             Console.WriteLine(result.GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
         }
@@ -455,13 +254,12 @@ public void Example_Update_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Update_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-            var data = new { };
-
-            Response response = await client.UpdateAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.UpdateAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -471,117 +269,51 @@ public async Task Example_Update_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Update_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                createTime = 123.45f,
-                createdBy = "<createdBy>",
-                end1 = new
-                {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new
-                    {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new
-                    {
-                        key = new { },
-                    },
-                },
-                end2 = new
+                ["createTime"] = 123.45F,
+                ["createdBy"] = "<createdBy>",
+                ["end1"] = new Dictionary<string, object>()
                 {
-                    displayText = "<displayText>",
-                    entityStatus = "ACTIVE",
-                    relationshipType = "<relationshipType>",
-                    relationshipAttributes = new
+                    ["guid"] = "<guid>",
+                    ["typeName"] = "<typeName>",
+                    ["uniqueAttributes"] = new Dictionary<string, object>()
                     {
-                        entityGuid = "<entityGuid>",
-                        entityStatus = "ACTIVE",
-                        removePropagationsOnEntityDelete = true,
-                        validityPeriods = new[] {
-                new {
-                    endTime = "<endTime>",
-                    startTime = "<startTime>",
-                    timeZone = "<timeZone>",
-                }
-            },
-                        source = "<source>",
-                        sourceDetails = new
-                        {
-                            key = new { },
-                        },
-                        attributes = new
-                        {
-                            key = new { },
-                        },
-                        typeName = "<typeName>",
-                        lastModifiedTS = "<lastModifiedTS>",
-                    },
-                    relationshipGuid = "<relationshipGuid>",
-                    relationshipStatus = "ACTIVE",
-                    guid = "<guid>",
-                    typeName = "<typeName>",
-                    uniqueAttributes = new
-                    {
-                        key = new { },
+                        ["key"] = new Dictionary<string, object>(),
                     },
                 },
-                guid = "<guid>",
-                homeId = "<homeId>",
-                label = "<label>",
-                provenanceType = 123.45f,
-                status = "ACTIVE",
-                updateTime = 123.45f,
-                updatedBy = "<updatedBy>",
-                version = 123.45f,
-                attributes = new
+                ["end2"] = null
+            ,
+                ["guid"] = "<guid>",
+                ["homeId"] = "<homeId>",
+                ["label"] = "<label>",
+                ["provenanceType"] = 123.45F,
+                ["status"] = "ACTIVE",
+                ["updateTime"] = 123.45F,
+                ["updatedBy"] = "<updatedBy>",
+                ["version"] = 123.45F,
+                ["attributes"] = new Dictionary<string, object>()
                 {
-                    key = new { },
+                    ["key"] = new Dictionary<string, object>(),
                 },
-                typeName = "<typeName>",
-                lastModifiedTS = "<lastModifiedTS>",
-            };
-
-            Response response = await client.UpdateAsync(RequestContent.Create(data));
+                ["typeName"] = "<typeName>",
+                ["lastModifiedTS"] = "<lastModifiedTS>",
+            });
+            Response response = await client.UpdateAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("createTime").ToString());
             Console.WriteLine(result.GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("end1").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("end1").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("end2").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("end2").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("homeId").ToString());
             Console.WriteLine(result.GetProperty("label").ToString());
@@ -590,7 +322,7 @@ public async Task Example_Update_AllParameters_Async()
             Console.WriteLine(result.GetProperty("updateTime").ToString());
             Console.WriteLine(result.GetProperty("updatedBy").ToString());
             Console.WriteLine(result.GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("lastModifiedTS").ToString());
         }
@@ -599,11 +331,11 @@ public async Task Example_Update_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPurviewRelationship()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-            Response response = client.GetPurviewRelationship("<guid>", true, new RequestContext());
+            Response response = client.GetPurviewRelationship("<guid>", null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -613,52 +345,52 @@ public void Example_GetPurviewRelationship()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetPurviewRelationship_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-            Response response = client.GetPurviewRelationship("<guid>", true, new RequestContext());
+            Response response = client.GetPurviewRelationship("<guid>", true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("createTime").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("homeId").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("label").ToString());
@@ -667,7 +399,7 @@ public void Example_GetPurviewRelationship_AllParameters()
             Console.WriteLine(result.GetProperty("relationship").GetProperty("updateTime").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("updatedBy").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("relationship").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationship").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("lastModifiedTS").ToString());
         }
@@ -676,11 +408,11 @@ public void Example_GetPurviewRelationship_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPurviewRelationship_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-            Response response = await client.GetPurviewRelationshipAsync("<guid>", true, new RequestContext());
+            Response response = await client.GetPurviewRelationshipAsync("<guid>", null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -690,52 +422,52 @@ public async Task Example_GetPurviewRelationship_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetPurviewRelationship_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
-            Response response = await client.GetPurviewRelationshipAsync("<guid>", true, new RequestContext());
+            Response response = await client.GetPurviewRelationshipAsync("<guid>", true, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classificationNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("guid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("isIncomplete").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("labels")[0].ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meaningNames")[0].ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("description").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("expression").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("source").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("steward").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("status").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("attributes").GetProperty("<test>").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<test>").GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classificationNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("entityStatus").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("removePropagationsOnEntityDelete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("endTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("startTime").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("validityPeriods")[0].GetProperty("timeZone").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("sourceDetails").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("classifications")[0].GetProperty("lastModifiedTS").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("guid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("isIncomplete").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("labels")[0].ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meaningNames")[0].ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("confidence").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("createdBy").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("description").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("displayText").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("expression").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("relationGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("source").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("steward").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("meanings")[0].GetProperty("termGuid").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("status").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("attributes").GetProperty("<key>").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("typeName").ToString());
+            Console.WriteLine(result.GetProperty("referredEntities").GetProperty("<key>").GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("createTime").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("createdBy").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationship").GetProperty("end1").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("typeName").ToString());
-            Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationship").GetProperty("end2").GetProperty("uniqueAttributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("homeId").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("label").ToString());
@@ -744,7 +476,7 @@ public async Task Example_GetPurviewRelationship_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationship").GetProperty("updateTime").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("updatedBy").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("version").ToString());
-            Console.WriteLine(result.GetProperty("relationship").GetProperty("attributes").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationship").GetProperty("attributes").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("relationship").GetProperty("lastModifiedTS").ToString());
         }
@@ -753,9 +485,9 @@ public async Task Example_GetPurviewRelationship_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
             Response response = client.Delete("<guid>");
             Console.WriteLine(response.Status);
@@ -765,9 +497,9 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
             Response response = client.Delete("<guid>");
             Console.WriteLine(response.Status);
@@ -777,9 +509,9 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
             Response response = await client.DeleteAsync("<guid>");
             Console.WriteLine(response.Status);
@@ -789,9 +521,9 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewRelationships client = new PurviewCatalogClient(endpoint, credential).GetPurviewRelationshipsClient();
 
             Response response = await client.DeleteAsync("<guid>");
             Console.WriteLine(response.Status);
diff --git a/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewTypes.cs b/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewTypes.cs
index 050ca3f65204..9861488326b0 100644
--- a/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewTypes.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Catalog/tests/Generated/Samples/Samples_PurviewTypes.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Catalog;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +23,11 @@ internal class Samples_PurviewTypes
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBusinessMetadataDefByGuid()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetBusinessMetadataDefByGuid("<guid>", new RequestContext());
+            Response response = client.GetBusinessMetadataDefByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -37,15 +37,15 @@ public void Example_GetBusinessMetadataDefByGuid()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBusinessMetadataDefByGuid_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetBusinessMetadataDefByGuid("<guid>", new RequestContext());
+            Response response = client.GetBusinessMetadataDefByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -54,7 +54,7 @@ public void Example_GetBusinessMetadataDefByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -81,7 +81,7 @@ public void Example_GetBusinessMetadataDefByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -94,11 +94,11 @@ public void Example_GetBusinessMetadataDefByGuid_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBusinessMetadataDefByGuid_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetBusinessMetadataDefByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetBusinessMetadataDefByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -108,15 +108,15 @@ public async Task Example_GetBusinessMetadataDefByGuid_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBusinessMetadataDefByGuid_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetBusinessMetadataDefByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetBusinessMetadataDefByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -125,7 +125,7 @@ public async Task Example_GetBusinessMetadataDefByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -152,7 +152,7 @@ public async Task Example_GetBusinessMetadataDefByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -165,11 +165,11 @@ public async Task Example_GetBusinessMetadataDefByGuid_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBusinessMetadataDefByName()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetBusinessMetadataDefByName("<name>", new RequestContext());
+            Response response = client.GetBusinessMetadataDefByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -179,15 +179,15 @@ public void Example_GetBusinessMetadataDefByName()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetBusinessMetadataDefByName_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetBusinessMetadataDefByName("<name>", new RequestContext());
+            Response response = client.GetBusinessMetadataDefByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -196,7 +196,7 @@ public void Example_GetBusinessMetadataDefByName_AllParameters()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -223,7 +223,7 @@ public void Example_GetBusinessMetadataDefByName_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -236,11 +236,11 @@ public void Example_GetBusinessMetadataDefByName_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBusinessMetadataDefByName_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetBusinessMetadataDefByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetBusinessMetadataDefByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -250,15 +250,15 @@ public async Task Example_GetBusinessMetadataDefByName_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetBusinessMetadataDefByName_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetBusinessMetadataDefByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetBusinessMetadataDefByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -267,7 +267,7 @@ public async Task Example_GetBusinessMetadataDefByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -294,7 +294,7 @@ public async Task Example_GetBusinessMetadataDefByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -307,11 +307,11 @@ public async Task Example_GetBusinessMetadataDefByName_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetClassificationDefByGuid()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetClassificationDefByGuid("<guid>", new RequestContext());
+            Response response = client.GetClassificationDefByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -321,18 +321,18 @@ public void Example_GetClassificationDefByGuid()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetClassificationDefByGuid_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetClassificationDefByGuid("<guid>", new RequestContext());
+            Response response = client.GetClassificationDefByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("entityTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("superTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -341,7 +341,7 @@ public void Example_GetClassificationDefByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -368,7 +368,7 @@ public void Example_GetClassificationDefByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -381,11 +381,11 @@ public void Example_GetClassificationDefByGuid_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetClassificationDefByGuid_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetClassificationDefByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetClassificationDefByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -395,18 +395,18 @@ public async Task Example_GetClassificationDefByGuid_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetClassificationDefByGuid_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetClassificationDefByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetClassificationDefByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("entityTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("superTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -415,7 +415,7 @@ public async Task Example_GetClassificationDefByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -442,7 +442,7 @@ public async Task Example_GetClassificationDefByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -455,11 +455,11 @@ public async Task Example_GetClassificationDefByGuid_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetClassificationDefByName()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetClassificationDefByName("<name>", new RequestContext());
+            Response response = client.GetClassificationDefByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -469,18 +469,18 @@ public void Example_GetClassificationDefByName()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetClassificationDefByName_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetClassificationDefByName("<name>", new RequestContext());
+            Response response = client.GetClassificationDefByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("entityTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("superTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -489,7 +489,7 @@ public void Example_GetClassificationDefByName_AllParameters()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -516,7 +516,7 @@ public void Example_GetClassificationDefByName_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -529,11 +529,11 @@ public void Example_GetClassificationDefByName_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetClassificationDefByName_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetClassificationDefByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetClassificationDefByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -543,18 +543,18 @@ public async Task Example_GetClassificationDefByName_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetClassificationDefByName_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetClassificationDefByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetClassificationDefByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("entityTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("superTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -563,7 +563,7 @@ public async Task Example_GetClassificationDefByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -590,7 +590,7 @@ public async Task Example_GetClassificationDefByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -603,11 +603,11 @@ public async Task Example_GetClassificationDefByName_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEntityDefinitionByGuid()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetEntityDefinitionByGuid("<guid>", new RequestContext());
+            Response response = client.GetEntityDefinitionByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -617,11 +617,11 @@ public void Example_GetEntityDefinitionByGuid()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEntityDefinitionByGuid_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetEntityDefinitionByGuid("<guid>", new RequestContext());
+            Response response = client.GetEntityDefinitionByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
@@ -629,7 +629,7 @@ public void Example_GetEntityDefinitionByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -638,12 +638,12 @@ public void Example_GetEntityDefinitionByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -652,7 +652,7 @@ public void Example_GetEntityDefinitionByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -679,7 +679,7 @@ public void Example_GetEntityDefinitionByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -692,11 +692,11 @@ public void Example_GetEntityDefinitionByGuid_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEntityDefinitionByGuid_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetEntityDefinitionByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetEntityDefinitionByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -706,11 +706,11 @@ public async Task Example_GetEntityDefinitionByGuid_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEntityDefinitionByGuid_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetEntityDefinitionByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetEntityDefinitionByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
@@ -718,7 +718,7 @@ public async Task Example_GetEntityDefinitionByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -727,12 +727,12 @@ public async Task Example_GetEntityDefinitionByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -741,7 +741,7 @@ public async Task Example_GetEntityDefinitionByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -768,7 +768,7 @@ public async Task Example_GetEntityDefinitionByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -781,11 +781,11 @@ public async Task Example_GetEntityDefinitionByGuid_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEntityDefinitionByName()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetEntityDefinitionByName("<name>", new RequestContext());
+            Response response = client.GetEntityDefinitionByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -795,11 +795,11 @@ public void Example_GetEntityDefinitionByName()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEntityDefinitionByName_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetEntityDefinitionByName("<name>", new RequestContext());
+            Response response = client.GetEntityDefinitionByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
@@ -807,7 +807,7 @@ public void Example_GetEntityDefinitionByName_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -816,12 +816,12 @@ public void Example_GetEntityDefinitionByName_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -830,7 +830,7 @@ public void Example_GetEntityDefinitionByName_AllParameters()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -857,7 +857,7 @@ public void Example_GetEntityDefinitionByName_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -870,11 +870,11 @@ public void Example_GetEntityDefinitionByName_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEntityDefinitionByName_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetEntityDefinitionByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetEntityDefinitionByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -884,11 +884,11 @@ public async Task Example_GetEntityDefinitionByName_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEntityDefinitionByName_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetEntityDefinitionByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetEntityDefinitionByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("subTypes")[0].ToString());
@@ -896,7 +896,7 @@ public async Task Example_GetEntityDefinitionByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -905,12 +905,12 @@ public async Task Example_GetEntityDefinitionByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -919,7 +919,7 @@ public async Task Example_GetEntityDefinitionByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -946,7 +946,7 @@ public async Task Example_GetEntityDefinitionByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -959,11 +959,11 @@ public async Task Example_GetEntityDefinitionByName_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEnumDefByGuid()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetEnumDefByGuid("<guid>", new RequestContext());
+            Response response = client.GetEnumDefByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -973,11 +973,11 @@ public void Example_GetEnumDefByGuid()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEnumDefByGuid_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetEnumDefByGuid("<guid>", new RequestContext());
+            Response response = client.GetEnumDefByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("defaultValue").ToString());
@@ -1007,7 +1007,7 @@ public void Example_GetEnumDefByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1020,11 +1020,11 @@ public void Example_GetEnumDefByGuid_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEnumDefByGuid_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetEnumDefByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetEnumDefByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1034,11 +1034,11 @@ public async Task Example_GetEnumDefByGuid_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEnumDefByGuid_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetEnumDefByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetEnumDefByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("defaultValue").ToString());
@@ -1068,7 +1068,7 @@ public async Task Example_GetEnumDefByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1081,11 +1081,11 @@ public async Task Example_GetEnumDefByGuid_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEnumDefByName()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetEnumDefByName("<name>", new RequestContext());
+            Response response = client.GetEnumDefByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1095,11 +1095,11 @@ public void Example_GetEnumDefByName()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetEnumDefByName_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetEnumDefByName("<name>", new RequestContext());
+            Response response = client.GetEnumDefByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("defaultValue").ToString());
@@ -1129,7 +1129,7 @@ public void Example_GetEnumDefByName_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1142,11 +1142,11 @@ public void Example_GetEnumDefByName_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEnumDefByName_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetEnumDefByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetEnumDefByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1156,11 +1156,11 @@ public async Task Example_GetEnumDefByName_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetEnumDefByName_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetEnumDefByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetEnumDefByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("defaultValue").ToString());
@@ -1190,7 +1190,7 @@ public async Task Example_GetEnumDefByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1203,11 +1203,11 @@ public async Task Example_GetEnumDefByName_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRelationshipDefByGuid()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetRelationshipDefByGuid("<guid>", new RequestContext());
+            Response response = client.GetRelationshipDefByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1217,11 +1217,11 @@ public void Example_GetRelationshipDefByGuid()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRelationshipDefByGuid_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetRelationshipDefByGuid("<guid>", new RequestContext());
+            Response response = client.GetRelationshipDefByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("endDef1").GetProperty("cardinality").ToString());
@@ -1239,7 +1239,7 @@ public void Example_GetRelationshipDefByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipCategory").ToString());
             Console.WriteLine(result.GetProperty("relationshipLabel").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1248,7 +1248,7 @@ public void Example_GetRelationshipDefByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1275,7 +1275,7 @@ public void Example_GetRelationshipDefByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1288,11 +1288,11 @@ public void Example_GetRelationshipDefByGuid_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRelationshipDefByGuid_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetRelationshipDefByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetRelationshipDefByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1302,11 +1302,11 @@ public async Task Example_GetRelationshipDefByGuid_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRelationshipDefByGuid_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetRelationshipDefByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetRelationshipDefByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("endDef1").GetProperty("cardinality").ToString());
@@ -1324,7 +1324,7 @@ public async Task Example_GetRelationshipDefByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipCategory").ToString());
             Console.WriteLine(result.GetProperty("relationshipLabel").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1333,7 +1333,7 @@ public async Task Example_GetRelationshipDefByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1360,7 +1360,7 @@ public async Task Example_GetRelationshipDefByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1373,11 +1373,11 @@ public async Task Example_GetRelationshipDefByGuid_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRelationshipDefByName()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetRelationshipDefByName("<name>", new RequestContext());
+            Response response = client.GetRelationshipDefByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1387,11 +1387,11 @@ public void Example_GetRelationshipDefByName()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRelationshipDefByName_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetRelationshipDefByName("<name>", new RequestContext());
+            Response response = client.GetRelationshipDefByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("endDef1").GetProperty("cardinality").ToString());
@@ -1409,7 +1409,7 @@ public void Example_GetRelationshipDefByName_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipCategory").ToString());
             Console.WriteLine(result.GetProperty("relationshipLabel").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1418,7 +1418,7 @@ public void Example_GetRelationshipDefByName_AllParameters()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1445,7 +1445,7 @@ public void Example_GetRelationshipDefByName_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1458,11 +1458,11 @@ public void Example_GetRelationshipDefByName_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRelationshipDefByName_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetRelationshipDefByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetRelationshipDefByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1472,11 +1472,11 @@ public async Task Example_GetRelationshipDefByName_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRelationshipDefByName_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetRelationshipDefByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetRelationshipDefByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("endDef1").GetProperty("cardinality").ToString());
@@ -1494,7 +1494,7 @@ public async Task Example_GetRelationshipDefByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipCategory").ToString());
             Console.WriteLine(result.GetProperty("relationshipLabel").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1503,7 +1503,7 @@ public async Task Example_GetRelationshipDefByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1530,7 +1530,7 @@ public async Task Example_GetRelationshipDefByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1543,11 +1543,11 @@ public async Task Example_GetRelationshipDefByName_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetStructDefByGuid()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetStructDefByGuid("<guid>", new RequestContext());
+            Response response = client.GetStructDefByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1557,15 +1557,15 @@ public void Example_GetStructDefByGuid()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetStructDefByGuid_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetStructDefByGuid("<guid>", new RequestContext());
+            Response response = client.GetStructDefByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1574,7 +1574,7 @@ public void Example_GetStructDefByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1601,7 +1601,7 @@ public void Example_GetStructDefByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1614,11 +1614,11 @@ public void Example_GetStructDefByGuid_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetStructDefByGuid_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetStructDefByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetStructDefByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1628,15 +1628,15 @@ public async Task Example_GetStructDefByGuid_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetStructDefByGuid_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetStructDefByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetStructDefByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1645,7 +1645,7 @@ public async Task Example_GetStructDefByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1672,7 +1672,7 @@ public async Task Example_GetStructDefByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1685,11 +1685,11 @@ public async Task Example_GetStructDefByGuid_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetStructDefByName()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetStructDefByName("<name>", new RequestContext());
+            Response response = client.GetStructDefByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1699,15 +1699,15 @@ public void Example_GetStructDefByName()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetStructDefByName_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetStructDefByName("<name>", new RequestContext());
+            Response response = client.GetStructDefByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1716,7 +1716,7 @@ public void Example_GetStructDefByName_AllParameters()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1743,7 +1743,7 @@ public void Example_GetStructDefByName_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1756,11 +1756,11 @@ public void Example_GetStructDefByName_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetStructDefByName_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetStructDefByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetStructDefByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1770,15 +1770,15 @@ public async Task Example_GetStructDefByName_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetStructDefByName_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetStructDefByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetStructDefByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -1787,7 +1787,7 @@ public async Task Example_GetStructDefByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -1814,7 +1814,7 @@ public async Task Example_GetStructDefByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1827,11 +1827,11 @@ public async Task Example_GetStructDefByName_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTypeDefinitionByGuid()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetTypeDefinitionByGuid("<guid>", new RequestContext());
+            Response response = client.GetTypeDefinitionByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1841,11 +1841,11 @@ public void Example_GetTypeDefinitionByGuid()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTypeDefinitionByGuid_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetTypeDefinitionByGuid("<guid>", new RequestContext());
+            Response response = client.GetTypeDefinitionByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("category").ToString());
@@ -1871,7 +1871,7 @@ public void Example_GetTypeDefinitionByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1884,11 +1884,11 @@ public void Example_GetTypeDefinitionByGuid_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTypeDefinitionByGuid_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetTypeDefinitionByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetTypeDefinitionByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1898,11 +1898,11 @@ public async Task Example_GetTypeDefinitionByGuid_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTypeDefinitionByGuid_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetTypeDefinitionByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetTypeDefinitionByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("category").ToString());
@@ -1928,7 +1928,7 @@ public async Task Example_GetTypeDefinitionByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1941,11 +1941,11 @@ public async Task Example_GetTypeDefinitionByGuid_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTypeDefinitionByName()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetTypeDefinitionByName("<name>", new RequestContext());
+            Response response = client.GetTypeDefinitionByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1955,11 +1955,11 @@ public void Example_GetTypeDefinitionByName()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTypeDefinitionByName_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetTypeDefinitionByName("<name>", new RequestContext());
+            Response response = client.GetTypeDefinitionByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("category").ToString());
@@ -1985,7 +1985,7 @@ public void Example_GetTypeDefinitionByName_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -1998,11 +1998,11 @@ public void Example_GetTypeDefinitionByName_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTypeDefinitionByName_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetTypeDefinitionByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetTypeDefinitionByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2012,11 +2012,11 @@ public async Task Example_GetTypeDefinitionByName_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTypeDefinitionByName_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetTypeDefinitionByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetTypeDefinitionByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("category").ToString());
@@ -2042,7 +2042,7 @@ public async Task Example_GetTypeDefinitionByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -2055,9 +2055,9 @@ public async Task Example_GetTypeDefinitionByName_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTypeByName()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
             Response response = client.DeleteTypeByName("<name>");
             Console.WriteLine(response.Status);
@@ -2067,9 +2067,9 @@ public void Example_DeleteTypeByName()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTypeByName_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
             Response response = client.DeleteTypeByName("<name>");
             Console.WriteLine(response.Status);
@@ -2079,9 +2079,9 @@ public void Example_DeleteTypeByName_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTypeByName_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
             Response response = await client.DeleteTypeByNameAsync("<name>");
             Console.WriteLine(response.Status);
@@ -2091,9 +2091,9 @@ public async Task Example_DeleteTypeByName_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTypeByName_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
             Response response = await client.DeleteTypeByNameAsync("<name>");
             Console.WriteLine(response.Status);
@@ -2103,11 +2103,11 @@ public async Task Example_DeleteTypeByName_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllTypeDefinitions()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetAllTypeDefinitions(true, "<type>", new RequestContext());
+            Response response = client.GetAllTypeDefinitions(null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2117,15 +2117,15 @@ public void Example_GetAllTypeDefinitions()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllTypeDefinitions_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetAllTypeDefinitions(true, "<type>", new RequestContext());
+            Response response = client.GetAllTypeDefinitions(true, "enum", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2134,7 +2134,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2161,7 +2161,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("updateTime").ToString());
@@ -2172,7 +2172,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("subTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("superTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2181,7 +2181,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2208,7 +2208,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("updateTime").ToString());
@@ -2220,7 +2220,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -2229,12 +2229,12 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2243,7 +2243,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2270,7 +2270,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("updateTime").ToString());
@@ -2304,7 +2304,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("updateTime").ToString());
@@ -2326,7 +2326,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipCategory").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipLabel").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2335,7 +2335,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2362,7 +2362,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updateTime").ToString());
@@ -2370,7 +2370,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2379,7 +2379,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2406,7 +2406,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updateTime").ToString());
@@ -2414,7 +2414,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2423,7 +2423,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2450,7 +2450,7 @@ public void Example_GetAllTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updateTime").ToString());
@@ -2463,11 +2463,11 @@ public void Example_GetAllTypeDefinitions_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllTypeDefinitions_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetAllTypeDefinitionsAsync(true, "<type>", new RequestContext());
+            Response response = await client.GetAllTypeDefinitionsAsync(null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2477,15 +2477,15 @@ public async Task Example_GetAllTypeDefinitions_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetAllTypeDefinitionsAsync(true, "<type>", new RequestContext());
+            Response response = await client.GetAllTypeDefinitionsAsync(true, "enum", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2494,7 +2494,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2521,7 +2521,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("updateTime").ToString());
@@ -2532,7 +2532,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("subTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("superTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2541,7 +2541,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2568,7 +2568,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("updateTime").ToString());
@@ -2580,7 +2580,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -2589,12 +2589,12 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2603,7 +2603,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2630,7 +2630,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("updateTime").ToString());
@@ -2664,7 +2664,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("updateTime").ToString());
@@ -2686,7 +2686,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipCategory").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipLabel").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2695,7 +2695,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2722,7 +2722,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updateTime").ToString());
@@ -2730,7 +2730,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2739,7 +2739,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2766,7 +2766,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updateTime").ToString());
@@ -2774,7 +2774,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -2783,7 +2783,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -2810,7 +2810,7 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updateTime").ToString());
@@ -2823,13 +2823,12 @@ public async Task Example_GetAllTypeDefinitions_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateTypeDefinitions()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            var data = new { };
-
-            Response response = client.CreateTypeDefinitions(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateTypeDefinitions(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2839,592 +2838,361 @@ public void Example_CreateTypeDefinitions()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateTypeDefinitions_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                businessMetadataDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                classificationDefs = new[] {
-        new {
-            entityTypes = new[] {
-                "<String>"
-            },
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                entityDefs = new[] {
-        new {
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            relationshipAttributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                enumDefs = new[] {
-        new {
-            defaultValue = "<defaultValue>",
-            elementDefs = new[] {
-                new {
-                    description = "<description>",
-                    ordinal = 123.45f,
-                    value = "<value>",
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                relationshipDefs = new[] {
-        new {
-            endDef1 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            endDef2 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            relationshipCategory = "ASSOCIATION",
-            relationshipLabel = "<relationshipLabel>",
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                structDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                termTemplateDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-            };
-
-            Response response = client.CreateTypeDefinitions(RequestContent.Create(data));
+                ["businessMetadataDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["params"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["type"] = "<type>",
+}
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["calendar"] = 123.45F,
+["dateInstance"] = null
+,
+["dateTimeInstance"] = null
+,
+["instance"] = null
+,
+["lenient"] = true,
+["numberFormat"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["currency"] = "<currency>",
+["currencyInstance"] = null
+,
+["groupingUsed"] = true,
+["instance"] = null
+,
+["integerInstance"] = null
+,
+["maximumFractionDigits"] = 1234,
+["maximumIntegerDigits"] = 1234,
+["minimumFractionDigits"] = 1234,
+["minimumIntegerDigits"] = 1234,
+["numberInstance"] = null
+,
+["parseIntegerOnly"] = true,
+["percentInstance"] = null
+,
+["roundingMode"] = "UP",
+},
+["timeInstance"] = null
+,
+["timeZone"] = new Dictionary<string, object>()
+{
+["dstSavings"] = 1234,
+["id"] = "<id>",
+["availableIds"] = new List<object>()
+{
+"<availableIds>"
+},
+["default"] = null
+,
+["displayName"] = "<displayName>",
+["rawOffset"] = 1234,
+},
+},
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["classificationDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["entityDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["relationshipAttributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["isLegacyAttribute"] = true,
+["relationshipTypeName"] = "<relationshipTypeName>",
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+null
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["enumDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["defaultValue"] = "<defaultValue>",
+["elementDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["ordinal"] = 123.45F,
+["value"] = "<value>",
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["relationshipDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endDef1"] = new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["description"] = "<description>",
+["isContainer"] = true,
+["isLegacyAttribute"] = true,
+["name"] = "<name>",
+["type"] = "<type>",
+},
+["endDef2"] = null
+,
+["relationshipCategory"] = "ASSOCIATION",
+["relationshipLabel"] = "<relationshipLabel>",
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["structDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["termTemplateDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+            });
+            Response response = client.CreateTypeDefinitions(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -3433,7 +3201,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -3460,7 +3228,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("updateTime").ToString());
@@ -3471,7 +3239,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("subTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("superTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -3480,7 +3248,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -3507,7 +3275,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("updateTime").ToString());
@@ -3519,7 +3287,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -3528,12 +3296,12 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -3542,7 +3310,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -3569,7 +3337,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("updateTime").ToString());
@@ -3603,7 +3371,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("updateTime").ToString());
@@ -3625,7 +3393,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipCategory").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipLabel").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -3634,7 +3402,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -3661,7 +3429,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updateTime").ToString());
@@ -3669,7 +3437,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -3678,7 +3446,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -3705,7 +3473,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updateTime").ToString());
@@ -3713,7 +3481,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -3722,7 +3490,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -3749,7 +3517,7 @@ public void Example_CreateTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updateTime").ToString());
@@ -3762,13 +3530,12 @@ public void Example_CreateTypeDefinitions_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateTypeDefinitions_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            var data = new { };
-
-            Response response = await client.CreateTypeDefinitionsAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateTypeDefinitionsAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -3778,592 +3545,361 @@ public async Task Example_CreateTypeDefinitions_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateTypeDefinitions_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                businessMetadataDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                classificationDefs = new[] {
-        new {
-            entityTypes = new[] {
-                "<String>"
-            },
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                entityDefs = new[] {
-        new {
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            relationshipAttributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                enumDefs = new[] {
-        new {
-            defaultValue = "<defaultValue>",
-            elementDefs = new[] {
-                new {
-                    description = "<description>",
-                    ordinal = 123.45f,
-                    value = "<value>",
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                relationshipDefs = new[] {
-        new {
-            endDef1 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            endDef2 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            relationshipCategory = "ASSOCIATION",
-            relationshipLabel = "<relationshipLabel>",
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                structDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                termTemplateDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-            };
-
-            Response response = await client.CreateTypeDefinitionsAsync(RequestContent.Create(data));
+                ["businessMetadataDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["params"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["type"] = "<type>",
+}
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["calendar"] = 123.45F,
+["dateInstance"] = null
+,
+["dateTimeInstance"] = null
+,
+["instance"] = null
+,
+["lenient"] = true,
+["numberFormat"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["currency"] = "<currency>",
+["currencyInstance"] = null
+,
+["groupingUsed"] = true,
+["instance"] = null
+,
+["integerInstance"] = null
+,
+["maximumFractionDigits"] = 1234,
+["maximumIntegerDigits"] = 1234,
+["minimumFractionDigits"] = 1234,
+["minimumIntegerDigits"] = 1234,
+["numberInstance"] = null
+,
+["parseIntegerOnly"] = true,
+["percentInstance"] = null
+,
+["roundingMode"] = "UP",
+},
+["timeInstance"] = null
+,
+["timeZone"] = new Dictionary<string, object>()
+{
+["dstSavings"] = 1234,
+["id"] = "<id>",
+["availableIds"] = new List<object>()
+{
+"<availableIds>"
+},
+["default"] = null
+,
+["displayName"] = "<displayName>",
+["rawOffset"] = 1234,
+},
+},
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["classificationDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["entityDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["relationshipAttributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["isLegacyAttribute"] = true,
+["relationshipTypeName"] = "<relationshipTypeName>",
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+null
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["enumDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["defaultValue"] = "<defaultValue>",
+["elementDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["ordinal"] = 123.45F,
+["value"] = "<value>",
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["relationshipDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endDef1"] = new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["description"] = "<description>",
+["isContainer"] = true,
+["isLegacyAttribute"] = true,
+["name"] = "<name>",
+["type"] = "<type>",
+},
+["endDef2"] = null
+,
+["relationshipCategory"] = "ASSOCIATION",
+["relationshipLabel"] = "<relationshipLabel>",
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["structDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["termTemplateDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+            });
+            Response response = await client.CreateTypeDefinitionsAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -4372,7 +3908,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -4399,7 +3935,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("updateTime").ToString());
@@ -4410,7 +3946,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("subTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("superTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -4419,7 +3955,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -4446,7 +3982,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("updateTime").ToString());
@@ -4458,7 +3994,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -4467,12 +4003,12 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -4481,7 +4017,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -4508,7 +4044,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("updateTime").ToString());
@@ -4542,7 +4078,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("updateTime").ToString());
@@ -4564,7 +4100,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipCategory").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipLabel").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -4573,7 +4109,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -4600,7 +4136,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updateTime").ToString());
@@ -4608,7 +4144,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -4617,7 +4153,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -4644,7 +4180,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updateTime").ToString());
@@ -4652,7 +4188,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -4661,7 +4197,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -4688,7 +4224,7 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updateTime").ToString());
@@ -4701,13 +4237,12 @@ public async Task Example_CreateTypeDefinitions_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateAtlasTypeDefinitions()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.UpdateAtlasTypeDefinitions(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.UpdateAtlasTypeDefinitions(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -4717,592 +4252,361 @@ public void Example_UpdateAtlasTypeDefinitions()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateAtlasTypeDefinitions_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                businessMetadataDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                classificationDefs = new[] {
-        new {
-            entityTypes = new[] {
-                "<String>"
-            },
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                entityDefs = new[] {
-        new {
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            relationshipAttributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                enumDefs = new[] {
-        new {
-            defaultValue = "<defaultValue>",
-            elementDefs = new[] {
-                new {
-                    description = "<description>",
-                    ordinal = 123.45f,
-                    value = "<value>",
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                relationshipDefs = new[] {
-        new {
-            endDef1 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            endDef2 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            relationshipCategory = "ASSOCIATION",
-            relationshipLabel = "<relationshipLabel>",
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                structDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                termTemplateDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-            };
-
-            Response response = client.UpdateAtlasTypeDefinitions(RequestContent.Create(data));
+                ["businessMetadataDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["params"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["type"] = "<type>",
+}
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["calendar"] = 123.45F,
+["dateInstance"] = null
+,
+["dateTimeInstance"] = null
+,
+["instance"] = null
+,
+["lenient"] = true,
+["numberFormat"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["currency"] = "<currency>",
+["currencyInstance"] = null
+,
+["groupingUsed"] = true,
+["instance"] = null
+,
+["integerInstance"] = null
+,
+["maximumFractionDigits"] = 1234,
+["maximumIntegerDigits"] = 1234,
+["minimumFractionDigits"] = 1234,
+["minimumIntegerDigits"] = 1234,
+["numberInstance"] = null
+,
+["parseIntegerOnly"] = true,
+["percentInstance"] = null
+,
+["roundingMode"] = "UP",
+},
+["timeInstance"] = null
+,
+["timeZone"] = new Dictionary<string, object>()
+{
+["dstSavings"] = 1234,
+["id"] = "<id>",
+["availableIds"] = new List<object>()
+{
+"<availableIds>"
+},
+["default"] = null
+,
+["displayName"] = "<displayName>",
+["rawOffset"] = 1234,
+},
+},
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["classificationDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["entityDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["relationshipAttributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["isLegacyAttribute"] = true,
+["relationshipTypeName"] = "<relationshipTypeName>",
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+null
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["enumDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["defaultValue"] = "<defaultValue>",
+["elementDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["ordinal"] = 123.45F,
+["value"] = "<value>",
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["relationshipDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endDef1"] = new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["description"] = "<description>",
+["isContainer"] = true,
+["isLegacyAttribute"] = true,
+["name"] = "<name>",
+["type"] = "<type>",
+},
+["endDef2"] = null
+,
+["relationshipCategory"] = "ASSOCIATION",
+["relationshipLabel"] = "<relationshipLabel>",
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["structDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["termTemplateDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+            });
+            Response response = client.UpdateAtlasTypeDefinitions(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -5311,7 +4615,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -5338,7 +4642,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("updateTime").ToString());
@@ -5349,7 +4653,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("subTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("superTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -5358,7 +4662,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -5385,7 +4689,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("updateTime").ToString());
@@ -5397,7 +4701,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -5406,12 +4710,12 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -5420,7 +4724,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -5447,7 +4751,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("updateTime").ToString());
@@ -5481,7 +4785,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("updateTime").ToString());
@@ -5503,7 +4807,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipCategory").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipLabel").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -5512,7 +4816,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -5539,7 +4843,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updateTime").ToString());
@@ -5547,7 +4851,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -5556,7 +4860,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -5583,7 +4887,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updateTime").ToString());
@@ -5591,7 +4895,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -5600,7 +4904,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -5627,7 +4931,7 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updateTime").ToString());
@@ -5640,13 +4944,12 @@ public void Example_UpdateAtlasTypeDefinitions_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateAtlasTypeDefinitions_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            var data = new { };
-
-            Response response = await client.UpdateAtlasTypeDefinitionsAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.UpdateAtlasTypeDefinitionsAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -5656,592 +4959,361 @@ public async Task Example_UpdateAtlasTypeDefinitions_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                businessMetadataDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                classificationDefs = new[] {
-        new {
-            entityTypes = new[] {
-                "<String>"
-            },
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                entityDefs = new[] {
-        new {
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            relationshipAttributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                enumDefs = new[] {
-        new {
-            defaultValue = "<defaultValue>",
-            elementDefs = new[] {
-                new {
-                    description = "<description>",
-                    ordinal = 123.45f,
-                    value = "<value>",
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                relationshipDefs = new[] {
-        new {
-            endDef1 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            endDef2 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            relationshipCategory = "ASSOCIATION",
-            relationshipLabel = "<relationshipLabel>",
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                structDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                termTemplateDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-            };
-
-            Response response = await client.UpdateAtlasTypeDefinitionsAsync(RequestContent.Create(data));
+                ["businessMetadataDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["params"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["type"] = "<type>",
+}
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["calendar"] = 123.45F,
+["dateInstance"] = null
+,
+["dateTimeInstance"] = null
+,
+["instance"] = null
+,
+["lenient"] = true,
+["numberFormat"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["currency"] = "<currency>",
+["currencyInstance"] = null
+,
+["groupingUsed"] = true,
+["instance"] = null
+,
+["integerInstance"] = null
+,
+["maximumFractionDigits"] = 1234,
+["maximumIntegerDigits"] = 1234,
+["minimumFractionDigits"] = 1234,
+["minimumIntegerDigits"] = 1234,
+["numberInstance"] = null
+,
+["parseIntegerOnly"] = true,
+["percentInstance"] = null
+,
+["roundingMode"] = "UP",
+},
+["timeInstance"] = null
+,
+["timeZone"] = new Dictionary<string, object>()
+{
+["dstSavings"] = 1234,
+["id"] = "<id>",
+["availableIds"] = new List<object>()
+{
+"<availableIds>"
+},
+["default"] = null
+,
+["displayName"] = "<displayName>",
+["rawOffset"] = 1234,
+},
+},
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["classificationDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["entityDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["relationshipAttributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["isLegacyAttribute"] = true,
+["relationshipTypeName"] = "<relationshipTypeName>",
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+null
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["enumDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["defaultValue"] = "<defaultValue>",
+["elementDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["ordinal"] = 123.45F,
+["value"] = "<value>",
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["relationshipDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endDef1"] = new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["description"] = "<description>",
+["isContainer"] = true,
+["isLegacyAttribute"] = true,
+["name"] = "<name>",
+["type"] = "<type>",
+},
+["endDef2"] = null
+,
+["relationshipCategory"] = "ASSOCIATION",
+["relationshipLabel"] = "<relationshipLabel>",
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["structDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["termTemplateDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+            });
+            Response response = await client.UpdateAtlasTypeDefinitionsAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -6250,7 +5322,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -6277,7 +5349,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("businessMetadataDefs")[0].GetProperty("updateTime").ToString());
@@ -6288,7 +5360,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("subTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("superTypes")[0].ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -6297,7 +5369,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -6324,7 +5396,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("classificationDefs")[0].GetProperty("updateTime").ToString());
@@ -6336,7 +5408,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isLegacyAttribute").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("relationshipTypeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("description").ToString());
@@ -6345,12 +5417,12 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("relationshipAttributeDefs")[0].GetProperty("valuesMinCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -6359,7 +5431,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -6386,7 +5458,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("entityDefs")[0].GetProperty("updateTime").ToString());
@@ -6420,7 +5492,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("enumDefs")[0].GetProperty("updateTime").ToString());
@@ -6442,7 +5514,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipCategory").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("relationshipLabel").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -6451,7 +5523,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -6478,7 +5550,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("updateTime").ToString());
@@ -6486,7 +5558,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("relationshipDefs")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -6495,7 +5567,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -6522,7 +5594,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("updateTime").ToString());
@@ -6530,7 +5602,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("version").ToString());
             Console.WriteLine(result.GetProperty("structDefs")[0].GetProperty("lastModifiedTS").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -6539,7 +5611,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -6566,7 +5638,7 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("termTemplateDefs")[0].GetProperty("updateTime").ToString());
@@ -6579,13 +5651,12 @@ public async Task Example_UpdateAtlasTypeDefinitions_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTypeDefinitions()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            var data = new { };
-
-            Response response = client.DeleteTypeDefinitions(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.DeleteTypeDefinitions(content);
             Console.WriteLine(response.Status);
         }
 
@@ -6593,588 +5664,357 @@ public void Example_DeleteTypeDefinitions()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTypeDefinitions_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                businessMetadataDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                classificationDefs = new[] {
-        new {
-            entityTypes = new[] {
-                "<String>"
-            },
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                entityDefs = new[] {
-        new {
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            relationshipAttributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                enumDefs = new[] {
-        new {
-            defaultValue = "<defaultValue>",
-            elementDefs = new[] {
-                new {
-                    description = "<description>",
-                    ordinal = 123.45f,
-                    value = "<value>",
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                relationshipDefs = new[] {
-        new {
-            endDef1 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            endDef2 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            relationshipCategory = "ASSOCIATION",
-            relationshipLabel = "<relationshipLabel>",
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                structDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                termTemplateDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-            };
-
-            Response response = client.DeleteTypeDefinitions(RequestContent.Create(data));
+                ["businessMetadataDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["params"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["type"] = "<type>",
+}
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["calendar"] = 123.45F,
+["dateInstance"] = null
+,
+["dateTimeInstance"] = null
+,
+["instance"] = null
+,
+["lenient"] = true,
+["numberFormat"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["currency"] = "<currency>",
+["currencyInstance"] = null
+,
+["groupingUsed"] = true,
+["instance"] = null
+,
+["integerInstance"] = null
+,
+["maximumFractionDigits"] = 1234,
+["maximumIntegerDigits"] = 1234,
+["minimumFractionDigits"] = 1234,
+["minimumIntegerDigits"] = 1234,
+["numberInstance"] = null
+,
+["parseIntegerOnly"] = true,
+["percentInstance"] = null
+,
+["roundingMode"] = "UP",
+},
+["timeInstance"] = null
+,
+["timeZone"] = new Dictionary<string, object>()
+{
+["dstSavings"] = 1234,
+["id"] = "<id>",
+["availableIds"] = new List<object>()
+{
+"<availableIds>"
+},
+["default"] = null
+,
+["displayName"] = "<displayName>",
+["rawOffset"] = 1234,
+},
+},
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["classificationDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["entityDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["relationshipAttributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["isLegacyAttribute"] = true,
+["relationshipTypeName"] = "<relationshipTypeName>",
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+null
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["enumDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["defaultValue"] = "<defaultValue>",
+["elementDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["ordinal"] = 123.45F,
+["value"] = "<value>",
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["relationshipDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endDef1"] = new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["description"] = "<description>",
+["isContainer"] = true,
+["isLegacyAttribute"] = true,
+["name"] = "<name>",
+["type"] = "<type>",
+},
+["endDef2"] = null
+,
+["relationshipCategory"] = "ASSOCIATION",
+["relationshipLabel"] = "<relationshipLabel>",
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["structDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["termTemplateDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+            });
+            Response response = client.DeleteTypeDefinitions(content);
             Console.WriteLine(response.Status);
         }
 
@@ -7182,13 +6022,12 @@ public void Example_DeleteTypeDefinitions_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTypeDefinitions_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.DeleteTypeDefinitionsAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.DeleteTypeDefinitionsAsync(content);
             Console.WriteLine(response.Status);
         }
 
@@ -7196,588 +6035,357 @@ public async Task Example_DeleteTypeDefinitions_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTypeDefinitions_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                businessMetadataDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                classificationDefs = new[] {
-        new {
-            entityTypes = new[] {
-                "<String>"
-            },
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                entityDefs = new[] {
-        new {
-            subTypes = new[] {
-                "<String>"
-            },
-            superTypes = new[] {
-                "<String>"
-            },
-            relationshipAttributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                enumDefs = new[] {
-        new {
-            defaultValue = "<defaultValue>",
-            elementDefs = new[] {
-                new {
-                    description = "<description>",
-                    ordinal = 123.45f,
-                    value = "<value>",
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                relationshipDefs = new[] {
-        new {
-            endDef1 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            endDef2 = new {
-                cardinality = "SINGLE",
-                description = "<description>",
-                isContainer = true,
-                isLegacyAttribute = true,
-                name = "<name>",
-                type = "<type>",
-            },
-            relationshipCategory = "ASSOCIATION",
-            relationshipLabel = "<relationshipLabel>",
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                structDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-                termTemplateDefs = new[] {
-        new {
-            attributeDefs = new[] {
-                new {
-                    isLegacyAttribute = true,
-                    relationshipTypeName = "<relationshipTypeName>",
-                    cardinality = "SINGLE",
-                    constraints = new[] {
-                        new {
-                            @params = new {
-                                key = new {},
-                            },
-                            type = "<type>",
-                        }
-                    },
-                    defaultValue = "<defaultValue>",
-                    description = "<description>",
-                    includeInNotification = true,
-                    isIndexable = true,
-                    isOptional = true,
-                    isUnique = true,
-                    name = "<name>",
-                    options = new {
-                        key = "<String>",
-                    },
-                    typeName = "<typeName>",
-                    valuesMaxCount = 1234,
-                    valuesMinCount = 1234,
-                }
-            },
-            category = "PRIMITIVE",
-            createTime = 123.45f,
-            createdBy = "<createdBy>",
-            dateFormatter = new {
-                availableLocales = new[] {
-                    "<String>"
-                },
-                calendar = 123.45f,
-                lenient = true,
-                numberFormat = new {
-                    availableLocales = new[] {
-                        "<String>"
-                    },
-                    currency = "<currency>",
-                    groupingUsed = true,
-                    maximumFractionDigits = 1234,
-                    maximumIntegerDigits = 1234,
-                    minimumFractionDigits = 1234,
-                    minimumIntegerDigits = 1234,
-                    parseIntegerOnly = true,
-                    roundingMode = "UP",
-                },
-                timeZone = new {
-                    dstSavings = 1234,
-                    id = "<id>",
-                    availableIds = new[] {
-                        "<String>"
-                    },
-                    displayName = "<displayName>",
-                    rawOffset = 1234,
-                },
-            },
-            description = "<description>",
-            guid = "<guid>",
-            name = "<name>",
-            options = new {
-                key = "<String>",
-            },
-            serviceType = "<serviceType>",
-            typeVersion = "<typeVersion>",
-            updateTime = 123.45f,
-            updatedBy = "<updatedBy>",
-            version = 123.45f,
-            lastModifiedTS = "<lastModifiedTS>",
-        }
-    },
-            };
-
-            Response response = await client.DeleteTypeDefinitionsAsync(RequestContent.Create(data));
+                ["businessMetadataDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["params"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["type"] = "<type>",
+}
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["calendar"] = 123.45F,
+["dateInstance"] = null
+,
+["dateTimeInstance"] = null
+,
+["instance"] = null
+,
+["lenient"] = true,
+["numberFormat"] = new Dictionary<string, object>()
+{
+["availableLocales"] = new List<object>()
+{
+"<availableLocales>"
+},
+["currency"] = "<currency>",
+["currencyInstance"] = null
+,
+["groupingUsed"] = true,
+["instance"] = null
+,
+["integerInstance"] = null
+,
+["maximumFractionDigits"] = 1234,
+["maximumIntegerDigits"] = 1234,
+["minimumFractionDigits"] = 1234,
+["minimumIntegerDigits"] = 1234,
+["numberInstance"] = null
+,
+["parseIntegerOnly"] = true,
+["percentInstance"] = null
+,
+["roundingMode"] = "UP",
+},
+["timeInstance"] = null
+,
+["timeZone"] = new Dictionary<string, object>()
+{
+["dstSavings"] = 1234,
+["id"] = "<id>",
+["availableIds"] = new List<object>()
+{
+"<availableIds>"
+},
+["default"] = null
+,
+["displayName"] = "<displayName>",
+["rawOffset"] = 1234,
+},
+},
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["classificationDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["entityTypes"] = new List<object>()
+{
+"<entityTypes>"
+},
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["entityDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["subTypes"] = new List<object>()
+{
+"<subTypes>"
+},
+["superTypes"] = new List<object>()
+{
+"<superTypes>"
+},
+["relationshipAttributeDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["isLegacyAttribute"] = true,
+["relationshipTypeName"] = "<relationshipTypeName>",
+["cardinality"] = "SINGLE",
+["constraints"] = new List<object>()
+{
+null
+},
+["defaultValue"] = "<defaultValue>",
+["description"] = "<description>",
+["includeInNotification"] = true,
+["isIndexable"] = true,
+["isOptional"] = true,
+["isUnique"] = true,
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["typeName"] = "<typeName>",
+["valuesMaxCount"] = 1234,
+["valuesMinCount"] = 1234,
+}
+},
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["enumDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["defaultValue"] = "<defaultValue>",
+["elementDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["description"] = "<description>",
+["ordinal"] = 123.45F,
+["value"] = "<value>",
+}
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["relationshipDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["endDef1"] = new Dictionary<string, object>()
+{
+["cardinality"] = "SINGLE",
+["description"] = "<description>",
+["isContainer"] = true,
+["isLegacyAttribute"] = true,
+["name"] = "<name>",
+["type"] = "<type>",
+},
+["endDef2"] = null
+,
+["relationshipCategory"] = "ASSOCIATION",
+["relationshipLabel"] = "<relationshipLabel>",
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["structDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+                ["termTemplateDefs"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["attributeDefs"] = new List<object>()
+{
+null
+},
+["category"] = "PRIMITIVE",
+["createTime"] = 123.45F,
+["createdBy"] = "<createdBy>",
+["dateFormatter"] = null
+,
+["description"] = "<description>",
+["guid"] = "<guid>",
+["name"] = "<name>",
+["options"] = new Dictionary<string, object>()
+{
+["key"] = "<options>",
+},
+["serviceType"] = "<serviceType>",
+["typeVersion"] = "<typeVersion>",
+["updateTime"] = 123.45F,
+["updatedBy"] = "<updatedBy>",
+["version"] = 123.45F,
+["lastModifiedTS"] = "<lastModifiedTS>",
+}
+},
+            });
+            Response response = await client.DeleteTypeDefinitionsAsync(content);
             Console.WriteLine(response.Status);
         }
 
@@ -7785,11 +6393,11 @@ public async Task Example_DeleteTypeDefinitions_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTypeDefinitionHeaders()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetTypeDefinitionHeaders(true, "<type>", new RequestContext());
+            Response response = client.GetTypeDefinitionHeaders(null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -7799,11 +6407,11 @@ public void Example_GetTypeDefinitionHeaders()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTypeDefinitionHeaders_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetTypeDefinitionHeaders(true, "<type>", new RequestContext());
+            Response response = client.GetTypeDefinitionHeaders(true, "enum", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("category").ToString());
@@ -7815,11 +6423,11 @@ public void Example_GetTypeDefinitionHeaders_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTypeDefinitionHeaders_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetTypeDefinitionHeadersAsync(true, "<type>", new RequestContext());
+            Response response = await client.GetTypeDefinitionHeadersAsync(null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -7829,11 +6437,11 @@ public async Task Example_GetTypeDefinitionHeaders_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTypeDefinitionHeaders_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetTypeDefinitionHeadersAsync(true, "<type>", new RequestContext());
+            Response response = await client.GetTypeDefinitionHeadersAsync(true, "enum", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("category").ToString());
@@ -7845,11 +6453,11 @@ public async Task Example_GetTypeDefinitionHeaders_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTermTemplateDefByGuid()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetTermTemplateDefByGuid("<guid>", new RequestContext());
+            Response response = client.GetTermTemplateDefByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -7859,15 +6467,15 @@ public void Example_GetTermTemplateDefByGuid()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTermTemplateDefByGuid_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetTermTemplateDefByGuid("<guid>", new RequestContext());
+            Response response = client.GetTermTemplateDefByGuid("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -7876,7 +6484,7 @@ public void Example_GetTermTemplateDefByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -7903,7 +6511,7 @@ public void Example_GetTermTemplateDefByGuid_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -7916,11 +6524,11 @@ public void Example_GetTermTemplateDefByGuid_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTermTemplateDefByGuid_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetTermTemplateDefByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetTermTemplateDefByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -7930,15 +6538,15 @@ public async Task Example_GetTermTemplateDefByGuid_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTermTemplateDefByGuid_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetTermTemplateDefByGuidAsync("<guid>", new RequestContext());
+            Response response = await client.GetTermTemplateDefByGuidAsync("<guid>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -7947,7 +6555,7 @@ public async Task Example_GetTermTemplateDefByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -7974,7 +6582,7 @@ public async Task Example_GetTermTemplateDefByGuid_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -7987,11 +6595,11 @@ public async Task Example_GetTermTemplateDefByGuid_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTermTemplateDefByName()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetTermTemplateDefByName("<name>", new RequestContext());
+            Response response = client.GetTermTemplateDefByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -8001,15 +6609,15 @@ public void Example_GetTermTemplateDefByName()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTermTemplateDefByName_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = client.GetTermTemplateDefByName("<name>", new RequestContext());
+            Response response = client.GetTermTemplateDefByName("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -8018,7 +6626,7 @@ public void Example_GetTermTemplateDefByName_AllParameters()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -8045,7 +6653,7 @@ public void Example_GetTermTemplateDefByName_AllParameters()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
@@ -8058,11 +6666,11 @@ public void Example_GetTermTemplateDefByName_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTermTemplateDefByName_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetTermTemplateDefByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetTermTemplateDefByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -8072,15 +6680,15 @@ public async Task Example_GetTermTemplateDefByName_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTermTemplateDefByName_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewTypes client = new PurviewCatalogClient(endpoint, credential).GetPurviewTypesClient();
 
-            Response response = await client.GetTermTemplateDefByNameAsync("<name>", new RequestContext());
+            Response response = await client.GetTermTemplateDefByNameAsync("<name>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("cardinality").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("params").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("constraints")[0].GetProperty("type").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("defaultValue").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("description").ToString());
@@ -8089,7 +6697,7 @@ public async Task Example_GetTermTemplateDefByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isOptional").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("isUnique").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("typeName").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMaxCount").ToString());
             Console.WriteLine(result.GetProperty("attributeDefs")[0].GetProperty("valuesMinCount").ToString());
@@ -8116,7 +6724,7 @@ public async Task Example_GetTermTemplateDefByName_AllParameters_Async()
             Console.WriteLine(result.GetProperty("description").ToString());
             Console.WriteLine(result.GetProperty("guid").ToString());
             Console.WriteLine(result.GetProperty("name").ToString());
-            Console.WriteLine(result.GetProperty("options").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("options").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("serviceType").ToString());
             Console.WriteLine(result.GetProperty("typeVersion").ToString());
             Console.WriteLine(result.GetProperty("updateTime").ToString());
diff --git a/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewClassificationRuleClient.xml b/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewClassificationRuleClient.xml
index 859071d589cc..5545b1aa8b77 100644
--- a/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewClassificationRuleClient.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewClassificationRuleClient.xml
@@ -2,166 +2,215 @@
 <doc>
   <members>
     <member name="GetPropertiesAsync(RequestContext)">
-<example>
-This sample shows how to call GetPropertiesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPropertiesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-Response response = await client.GetPropertiesAsync(new RequestContext());
+Response response = await client.GetPropertiesAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPropertiesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
+
+Response response = await client.GetPropertiesAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetProperties(RequestContext)">
-<example>
-This sample shows how to call GetProperties with required parameters and parse the result.
+      <example>
+This sample shows how to call GetProperties and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-Response response = client.GetProperties(new RequestContext());
+Response response = client.GetProperties(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetProperties with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
+
+Response response = client.GetProperties(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-var data = new {
-    kind = "System",
-};
-
-Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.CreateOrUpdateAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-var data = new {
-    properties = new {
-        description = "<description>",
-        classificationName = "<classificationName>",
-        ruleStatus = "Enabled",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["description"] = "<description>",
+        ["classificationName"] = "<classificationName>",
+        ["ruleStatus"] = "Enabled",
     },
-    kind = "System",
-};
-
-Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+    ["kind"] = "System",
+});
+Response response = await client.CreateOrUpdateAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-var data = new {
-    kind = "System",
-};
-
-Response response = client.CreateOrUpdate(RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.CreateOrUpdate(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-var data = new {
-    properties = new {
-        description = "<description>",
-        classificationName = "<classificationName>",
-        ruleStatus = "Enabled",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["description"] = "<description>",
+        ["classificationName"] = "<classificationName>",
+        ["ruleStatus"] = "Enabled",
     },
-    kind = "System",
-};
-
-Response response = client.CreateOrUpdate(RequestContent.Create(data));
+    ["kind"] = "System",
+});
+Response response = client.CreateOrUpdate(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteAsync(RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-Response response = await client.DeleteAsync(new RequestContext());
+Response response = await client.DeleteAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
+
+Response response = await client.DeleteAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="Delete(RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters and parse the result.
+      <example>
+This sample shows how to call Delete and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-Response response = client.Delete(new RequestContext());
+Response response = client.Delete(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call Delete with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
+
+Response response = client.Delete(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="TagVersionAsync(int,string,RequestContext)">
-<example>
-This sample shows how to call TagVersionAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call TagVersionAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-Response response = await client.TagVersionAsync(1234, "<action>", new RequestContext());
+Response response = await client.TagVersionAsync(1234, "Keep", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call TagVersionAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
+
+Response response = await client.TagVersionAsync(1234, "Keep", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("scanResultId").ToString());
@@ -174,18 +223,28 @@ Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="TagVersion(int,string,RequestContext)">
-<example>
-This sample shows how to call TagVersion with required parameters and parse the result.
+      <example>
+This sample shows how to call TagVersion and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
+
+Response response = client.TagVersion(1234, "Keep", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call TagVersion with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-Response response = client.TagVersion(1234, "<action>", new RequestContext());
+Response response = client.TagVersion(1234, "Keep", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("scanResultId").ToString());
@@ -198,44 +257,67 @@ Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetVersionsAsync(RequestContext)">
-<example>
-This sample shows how to call GetVersionsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetVersionsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-await foreach (var item in client.GetVersionsAsync(new RequestContext()))
+await foreach (BinaryData item in client.GetVersionsAsync(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetVersionsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
+
+await foreach (BinaryData item in client.GetVersionsAsync(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetVersions(RequestContext)">
-<example>
-This sample shows how to call GetVersions with required parameters and parse the result.
+      <example>
+This sample shows how to call GetVersions and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-foreach (var item in client.GetVersions(new RequestContext()))
+foreach (BinaryData item in client.GetVersions(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetVersions with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
+
+foreach (BinaryData item in client.GetVersions(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewDataSourceClient.xml b/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewDataSourceClient.xml
index d134c7397e63..6990eb452a56 100644
--- a/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewDataSourceClient.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewDataSourceClient.xml
@@ -2,40 +2,39 @@
 <doc>
   <members>
     <member name="CreateOrUpdateAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-var data = new {
-    kind = "AzureSubscription",
-};
-
-Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.CreateOrUpdateAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-var data = new {
-    properties = new {
-        subscriptionId = "<subscriptionId>",
-        collection = new {
-            referenceName = "<referenceName>",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["subscriptionId"] = "<subscriptionId>",
+        ["collection"] = new Dictionary<string, object>()
+        {
+            ["referenceName"] = "<referenceName>",
         },
     },
-    kind = "AzureSubscription",
-};
-
-Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+    ["kind"] = "AzureSubscription",
+});
+Response response = await client.CreateOrUpdateAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -48,7 +47,7 @@ Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].G
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -69,44 +68,42 @@ Console.WriteLine(result.GetProperty("scans")[0].GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-var data = new {
-    kind = "AzureSubscription",
-};
-
-Response response = client.CreateOrUpdate(RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.CreateOrUpdate(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-var data = new {
-    properties = new {
-        subscriptionId = "<subscriptionId>",
-        collection = new {
-            referenceName = "<referenceName>",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["subscriptionId"] = "<subscriptionId>",
+        ["collection"] = new Dictionary<string, object>()
+        {
+            ["referenceName"] = "<referenceName>",
         },
     },
-    kind = "AzureSubscription",
-};
-
-Response response = client.CreateOrUpdate(RequestContent.Create(data));
+    ["kind"] = "AzureSubscription",
+});
+Response response = client.CreateOrUpdate(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -119,7 +116,7 @@ Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].G
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -140,18 +137,29 @@ Console.WriteLine(result.GetProperty("scans")[0].GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetPropertiesAsync(RequestContext)">
-<example>
-This sample shows how to call GetPropertiesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPropertiesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-Response response = await client.GetPropertiesAsync(new RequestContext());
+Response response = await client.GetPropertiesAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPropertiesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
+
+Response response = await client.GetPropertiesAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -164,7 +172,7 @@ Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].G
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -185,18 +193,29 @@ Console.WriteLine(result.GetProperty("scans")[0].GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetProperties(RequestContext)">
-<example>
-This sample shows how to call GetProperties with required parameters and parse the result.
+      <example>
+This sample shows how to call GetProperties and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
+
+Response response = client.GetProperties(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetProperties with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-Response response = client.GetProperties(new RequestContext());
+Response response = client.GetProperties(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -209,7 +228,7 @@ Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].G
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -230,18 +249,29 @@ Console.WriteLine(result.GetProperty("scans")[0].GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteAsync(RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
+
+Response response = await client.DeleteAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-Response response = await client.DeleteAsync(new RequestContext());
+Response response = await client.DeleteAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -254,7 +284,7 @@ Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].G
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -275,18 +305,29 @@ Console.WriteLine(result.GetProperty("scans")[0].GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="Delete(RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters and parse the result.
+      <example>
+This sample shows how to call Delete and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-Response response = client.Delete(new RequestContext());
+Response response = client.Delete(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call Delete with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
+
+Response response = client.Delete(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -299,7 +340,7 @@ Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].G
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -320,94 +361,117 @@ Console.WriteLine(result.GetProperty("scans")[0].GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("scans")[0].GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetScansAsync(RequestContext)">
-<example>
-This sample shows how to call GetScansAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetScansAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-await foreach (var item in client.GetScansAsync(new RequestContext()))
+await foreach (BinaryData item in client.GetScansAsync(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("endTime").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("runType").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetScansAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
+
+await foreach (BinaryData item in client.GetScansAsync(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("endTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("runType").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetScans(RequestContext)">
-<example>
-This sample shows how to call GetScans with required parameters and parse the result.
+      <example>
+This sample shows how to call GetScans and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-foreach (var item in client.GetScans(new RequestContext()))
+foreach (BinaryData item in client.GetScans(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("endTime").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("runType").ToString());
-    Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetScans with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
+
+foreach (BinaryData item in client.GetScans(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("endTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("runType").ToString());
+    Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewScanClient.xml b/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewScanClient.xml
index c3b3bb0198fc..97a9231894ae 100644
--- a/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewScanClient.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewScanClient.xml
@@ -2,665 +2,273 @@
 <doc>
   <members>
     <member name="GetFilterAsync(RequestContext)">
-<example>
-This sample shows how to call GetFilterAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFilterAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = await client.GetFilterAsync(new RequestContext());
+Response response = await client.GetFilterAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetFilterAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+Response response = await client.GetFilterAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("excludeUriPrefixes")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("includeUriPrefixes")[0].ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetFilter(RequestContext)">
-<example>
-This sample shows how to call GetFilter with required parameters and parse the result.
+      <example>
+This sample shows how to call GetFilter and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = client.GetFilter(new RequestContext());
+Response response = client.GetFilter(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetFilter with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+Response response = client.GetFilter(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("excludeUriPrefixes")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("includeUriPrefixes")[0].ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateFilterAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateFilterAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-var data = new {};
-
-Response response = await client.CreateOrUpdateFilterAsync(RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.CreateOrUpdateFilterAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateFilterAsync with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateFilterAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
-
-var data = new {
-    properties = new {
-        excludeUriPrefixes = new[] {
-            "<String>"
-        },
-        includeUriPrefixes = new[] {
-            "<String>"
-        },
-    },
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = await client.CreateOrUpdateFilterAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["excludeUriPrefixes"] = new List<object>()
+{
+"<excludeUriPrefixes>"
+},
+        ["includeUriPrefixes"] = new List<object>()
+{
+"<includeUriPrefixes>"
+},
+    },
+});
+Response response = await client.CreateOrUpdateFilterAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("excludeUriPrefixes")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("includeUriPrefixes")[0].ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateFilter(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateFilter and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = client.CreateOrUpdateFilter(RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.CreateOrUpdateFilter(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateFilter with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateFilter with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
-
-var data = new {
-    properties = new {
-        excludeUriPrefixes = new[] {
-            "<String>"
-        },
-        includeUriPrefixes = new[] {
-            "<String>"
-        },
-    },
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = client.CreateOrUpdateFilter(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["excludeUriPrefixes"] = new List<object>()
+{
+"<excludeUriPrefixes>"
+},
+        ["includeUriPrefixes"] = new List<object>()
+{
+"<includeUriPrefixes>"
+},
+    },
+});
+Response response = client.CreateOrUpdateFilter(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("excludeUriPrefixes")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("includeUriPrefixes")[0].ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateAsync with required request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-var data = new {
-    kind = "AzureSubscriptionCredential",
-};
-
-Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["kind"] = "AzureSubscriptionCredential",
+});
+Response response = await client.CreateOrUpdateAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateAsync with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
-
-var data = new {
-    properties = new {
-        resourceTypes = new {
-            None = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureSubscription = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureResourceGroup = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureSynapseWorkspace = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureSynapse = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AdlsGen1 = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AdlsGen2 = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AmazonAccount = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AmazonS3 = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AmazonSql = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureCosmosDb = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureDataExplorer = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureFileService = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureSqlDatabase = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AmazonPostgreSql = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzurePostgreSql = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            SqlServerDatabase = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureSqlDatabaseManagedInstance = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureSqlDataWarehouse = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureMySql = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureStorage = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            Teradata = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            Oracle = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            SapS4Hana = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            SapEcc = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            PowerBI = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["resourceTypes"] = new Dictionary<string, object>()
+        {
+            ["None"] = new Dictionary<string, object>()
+            {
+                ["scanRulesetName"] = "<scanRulesetName>",
+                ["scanRulesetType"] = "Custom",
+                ["resourceNameFilter"] = new Dictionary<string, object>()
+                {
+                    ["excludePrefixes"] = new List<object>()
+{
+"<excludePrefixes>"
+},
+                    ["includePrefixes"] = new List<object>()
+{
+"<includePrefixes>"
+},
+                    ["resources"] = new List<object>()
+{
+"<resources>"
+},
                 },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
+                ["credential"] = new Dictionary<string, object>()
+                {
+                    ["referenceName"] = "<referenceName>",
+                    ["credentialType"] = "AccountKey",
                 },
             },
+            ["AzureSubscription"] = null
+,
+            ["AzureResourceGroup"] = null
+,
+            ["AzureSynapseWorkspace"] = null
+,
+            ["AzureSynapse"] = null
+,
+            ["AdlsGen1"] = null
+,
+            ["AdlsGen2"] = null
+,
+            ["AmazonAccount"] = null
+,
+            ["AmazonS3"] = null
+,
+            ["AmazonSql"] = null
+,
+            ["AzureCosmosDb"] = null
+,
+            ["AzureDataExplorer"] = null
+,
+            ["AzureFileService"] = null
+,
+            ["AzureSqlDatabase"] = null
+,
+            ["AmazonPostgreSql"] = null
+,
+            ["AzurePostgreSql"] = null
+,
+            ["SqlServerDatabase"] = null
+,
+            ["AzureSqlDatabaseManagedInstance"] = null
+,
+            ["AzureSqlDataWarehouse"] = null
+,
+            ["AzureMySql"] = null
+,
+            ["AzureStorage"] = null
+,
+            ["Teradata"] = null
+,
+            ["Oracle"] = null
+,
+            ["SapS4Hana"] = null
+,
+            ["SapEcc"] = null
+,
+            ["PowerBI"] = null
+,
         },
-        credential = new {
-            referenceName = "<referenceName>",
-            credentialType = "AccountKey",
+        ["credential"] = new Dictionary<string, object>()
+        {
+            ["referenceName"] = "<referenceName>",
+            ["credentialType"] = "AccountKey",
         },
-        scanRulesetName = "<scanRulesetName>",
-        scanRulesetType = "Custom",
-        collection = new {
-            referenceName = "<referenceName>",
+        ["scanRulesetName"] = "<scanRulesetName>",
+        ["scanRulesetType"] = "Custom",
+        ["collection"] = new Dictionary<string, object>()
+        {
+            ["referenceName"] = "<referenceName>",
         },
-        workers = 1234,
-        connectedVia = new {
-            referenceName = "<referenceName>",
+        ["workers"] = 1234,
+        ["connectedVia"] = new Dictionary<string, object>()
+        {
+            ["referenceName"] = "<referenceName>",
         },
     },
-    kind = "AzureSubscriptionCredential",
-};
-
-Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+    ["kind"] = "AzureSubscriptionCredential",
+});
+Response response = await client.CreateOrUpdateAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -672,7 +280,7 @@ Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsDiscov
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -691,549 +299,134 @@ Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("runType").To
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdate(RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdate with required request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdate and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-var data = new {
-    kind = "AzureSubscriptionCredential",
-};
-
-Response response = client.CreateOrUpdate(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["kind"] = "AzureSubscriptionCredential",
+});
+Response response = client.CreateOrUpdate(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdate with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdate with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
-
-var data = new {
-    properties = new {
-        resourceTypes = new {
-            None = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureSubscription = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureResourceGroup = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureSynapseWorkspace = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureSynapse = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AdlsGen1 = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AdlsGen2 = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AmazonAccount = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AmazonS3 = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AmazonSql = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureCosmosDb = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureDataExplorer = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureFileService = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureSqlDatabase = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AmazonPostgreSql = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzurePostgreSql = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            SqlServerDatabase = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureSqlDatabaseManagedInstance = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureSqlDataWarehouse = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureMySql = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            AzureStorage = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            Teradata = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            Oracle = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            SapS4Hana = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            SapEcc = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
-                },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
-                },
-            },
-            PowerBI = new {
-                scanRulesetName = "<scanRulesetName>",
-                scanRulesetType = "Custom",
-                resourceNameFilter = new {
-                    excludePrefixes = new[] {
-                        "<String>"
-                    },
-                    includePrefixes = new[] {
-                        "<String>"
-                    },
-                    resources = new[] {
-                        "<String>"
-                    },
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["resourceTypes"] = new Dictionary<string, object>()
+        {
+            ["None"] = new Dictionary<string, object>()
+            {
+                ["scanRulesetName"] = "<scanRulesetName>",
+                ["scanRulesetType"] = "Custom",
+                ["resourceNameFilter"] = new Dictionary<string, object>()
+                {
+                    ["excludePrefixes"] = new List<object>()
+{
+"<excludePrefixes>"
+},
+                    ["includePrefixes"] = new List<object>()
+{
+"<includePrefixes>"
+},
+                    ["resources"] = new List<object>()
+{
+"<resources>"
+},
                 },
-                credential = new {
-                    referenceName = "<referenceName>",
-                    credentialType = "AccountKey",
+                ["credential"] = new Dictionary<string, object>()
+                {
+                    ["referenceName"] = "<referenceName>",
+                    ["credentialType"] = "AccountKey",
                 },
             },
+            ["AzureSubscription"] = null
+,
+            ["AzureResourceGroup"] = null
+,
+            ["AzureSynapseWorkspace"] = null
+,
+            ["AzureSynapse"] = null
+,
+            ["AdlsGen1"] = null
+,
+            ["AdlsGen2"] = null
+,
+            ["AmazonAccount"] = null
+,
+            ["AmazonS3"] = null
+,
+            ["AmazonSql"] = null
+,
+            ["AzureCosmosDb"] = null
+,
+            ["AzureDataExplorer"] = null
+,
+            ["AzureFileService"] = null
+,
+            ["AzureSqlDatabase"] = null
+,
+            ["AmazonPostgreSql"] = null
+,
+            ["AzurePostgreSql"] = null
+,
+            ["SqlServerDatabase"] = null
+,
+            ["AzureSqlDatabaseManagedInstance"] = null
+,
+            ["AzureSqlDataWarehouse"] = null
+,
+            ["AzureMySql"] = null
+,
+            ["AzureStorage"] = null
+,
+            ["Teradata"] = null
+,
+            ["Oracle"] = null
+,
+            ["SapS4Hana"] = null
+,
+            ["SapEcc"] = null
+,
+            ["PowerBI"] = null
+,
         },
-        credential = new {
-            referenceName = "<referenceName>",
-            credentialType = "AccountKey",
+        ["credential"] = new Dictionary<string, object>()
+        {
+            ["referenceName"] = "<referenceName>",
+            ["credentialType"] = "AccountKey",
         },
-        scanRulesetName = "<scanRulesetName>",
-        scanRulesetType = "Custom",
-        collection = new {
-            referenceName = "<referenceName>",
+        ["scanRulesetName"] = "<scanRulesetName>",
+        ["scanRulesetType"] = "Custom",
+        ["collection"] = new Dictionary<string, object>()
+        {
+            ["referenceName"] = "<referenceName>",
         },
-        workers = 1234,
-        connectedVia = new {
-            referenceName = "<referenceName>",
+        ["workers"] = 1234,
+        ["connectedVia"] = new Dictionary<string, object>()
+        {
+            ["referenceName"] = "<referenceName>",
         },
     },
-    kind = "AzureSubscriptionCredential",
-};
-
-Response response = client.CreateOrUpdate(RequestContent.Create(data));
+    ["kind"] = "AzureSubscriptionCredential",
+});
+Response response = client.CreateOrUpdate(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -1245,7 +438,7 @@ Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsDiscov
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -1264,18 +457,29 @@ Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("runType").To
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetPropertiesAsync(RequestContext)">
-<example>
-This sample shows how to call GetPropertiesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetPropertiesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = await client.GetPropertiesAsync(new RequestContext());
+Response response = await client.GetPropertiesAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetPropertiesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+Response response = await client.GetPropertiesAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -1287,7 +491,7 @@ Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsDiscov
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -1306,18 +510,29 @@ Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("runType").To
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetProperties(RequestContext)">
-<example>
-This sample shows how to call GetProperties with required parameters and parse the result.
+      <example>
+This sample shows how to call GetProperties and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+Response response = client.GetProperties(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetProperties with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = client.GetProperties(new RequestContext());
+Response response = client.GetProperties(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -1329,7 +544,7 @@ Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsDiscov
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -1348,18 +563,29 @@ Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("runType").To
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteAsync(RequestContext)">
-<example>
-This sample shows how to call DeleteAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = await client.DeleteAsync(new RequestContext());
+Response response = await client.DeleteAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+Response response = await client.DeleteAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -1371,7 +597,7 @@ Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsDiscov
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -1390,18 +616,29 @@ Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("runType").To
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="Delete(RequestContext)">
-<example>
-This sample shows how to call Delete with required parameters and parse the result.
+      <example>
+This sample shows how to call Delete and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+Response response = client.Delete(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call Delete with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = client.Delete(new RequestContext());
+Response response = client.Delete(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -1413,7 +650,7 @@ Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsDiscov
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -1432,18 +669,28 @@ Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("runType").To
 Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RunScanAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call RunScanAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call RunScanAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = await client.RunScanAsync("<runId>", "<scanLevel>", new RequestContext());
+Response response = await client.RunScanAsync("<runId>", null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call RunScanAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+Response response = await client.RunScanAsync("<runId>", "Full", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("scanResultId").ToString());
@@ -1456,18 +703,28 @@ Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RunScan(string,string,RequestContext)">
-<example>
-This sample shows how to call RunScan with required parameters and parse the result.
+      <example>
+This sample shows how to call RunScan and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = client.RunScan("<runId>", "<scanLevel>", new RequestContext());
+Response response = client.RunScan("<runId>", null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call RunScan with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+Response response = client.RunScan("<runId>", "Full", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("scanResultId").ToString());
@@ -1480,18 +737,28 @@ Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CancelScanAsync(string,RequestContext)">
-<example>
-This sample shows how to call CancelScanAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CancelScanAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+Response response = await client.CancelScanAsync("<runId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call CancelScanAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = await client.CancelScanAsync("<runId>", new RequestContext());
+Response response = await client.CancelScanAsync("<runId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("scanResultId").ToString());
@@ -1504,18 +771,28 @@ Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CancelScan(string,RequestContext)">
-<example>
-This sample shows how to call CancelScan with required parameters and parse the result.
+      <example>
+This sample shows how to call CancelScan and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = client.CancelScan("<runId>", new RequestContext());
+Response response = client.CancelScan("<runId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call CancelScan with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+Response response = client.CancelScan("<runId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("scanResultId").ToString());
@@ -1528,30 +805,40 @@ Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTriggerAsync(RequestContext)">
-<example>
-This sample shows how to call GetTriggerAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTriggerAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = await client.GetTriggerAsync(new RequestContext());
+Response response = await client.GetTriggerAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTriggerAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+Response response = await client.GetTriggerAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("frequency").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("interval").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("minutes")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("hours")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("weekDays")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthDays")[0].ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("day").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("occurrence").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("timeZone").ToString());
@@ -1563,30 +850,40 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("scanLevel").ToSt
 Console.WriteLine(result.GetProperty("properties").GetProperty("incrementalScanStartTime").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetTrigger(RequestContext)">
-<example>
-This sample shows how to call GetTrigger with required parameters and parse the result.
+      <example>
+This sample shows how to call GetTrigger and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+Response response = client.GetTrigger(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetTrigger with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = client.GetTrigger(new RequestContext());
+Response response = client.GetTrigger(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("frequency").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("interval").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("minutes")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("hours")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("weekDays")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthDays")[0].ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("day").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("occurrence").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("timeZone").ToString());
@@ -1598,84 +895,93 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("scanLevel").ToSt
 Console.WriteLine(result.GetProperty("properties").GetProperty("incrementalScanStartTime").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateTriggerAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateTriggerAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = await client.CreateOrUpdateTriggerAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateTriggerAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateTriggerAsync with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateTriggerAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
-
-var data = new {
-    properties = new {
-        recurrence = new {
-            frequency = "Week",
-            interval = 1234,
-            startTime = "2022-05-10T18:57:31.2311892Z",
-            endTime = "2022-05-10T18:57:31.2311892Z",
-            schedule = new {
-                additionalProperties = new {
-                    key = new {},
-                },
-                minutes = new[] {
-                    1234
-                },
-                hours = new[] {
-                    1234
-                },
-                weekDays = new[] {
-                    "Sunday"
-                },
-                monthDays = new[] {
-                    1234
-                },
-                monthlyOccurrences = new[] {
-                    new {
-                        additionalProperties = new {
-                            key = new {},
-                        },
-                        day = "Sunday",
-                        occurrence = 1234,
-                    }
-                },
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["recurrence"] = new Dictionary<string, object>()
+        {
+            ["frequency"] = "Week",
+            ["interval"] = 1234,
+            ["startTime"] = "2022-05-10T18:57:31.2311892Z",
+            ["endTime"] = "2022-05-10T18:57:31.2311892Z",
+            ["schedule"] = new Dictionary<string, object>()
+            {
+                ["additionalProperties"] = new Dictionary<string, object>()
+                {
+                    ["key"] = new Dictionary<string, object>(),
+                },
+                ["minutes"] = new List<object>()
+{
+1234
+},
+                ["hours"] = new List<object>()
+{
+1234
+},
+                ["weekDays"] = new List<object>()
+{
+"Sunday"
+},
+                ["monthDays"] = new List<object>()
+{
+1234
+},
+                ["monthlyOccurrences"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["additionalProperties"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["day"] = "Sunday",
+["occurrence"] = 1234,
+}
+},
             },
-            timeZone = "<timeZone>",
+            ["timeZone"] = "<timeZone>",
         },
-        recurrenceInterval = "<recurrenceInterval>",
-        scanLevel = "Full",
-        incrementalScanStartTime = "2022-05-10T18:57:31.2311892Z",
+        ["recurrenceInterval"] = "<recurrenceInterval>",
+        ["scanLevel"] = "Full",
+        ["incrementalScanStartTime"] = "2022-05-10T18:57:31.2311892Z",
     },
-};
-
-Response response = await client.CreateOrUpdateTriggerAsync(RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateTriggerAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("frequency").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("interval").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("minutes")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("hours")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("weekDays")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthDays")[0].ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("day").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("occurrence").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("timeZone").ToString());
@@ -1687,84 +993,93 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("scanLevel").ToSt
 Console.WriteLine(result.GetProperty("properties").GetProperty("incrementalScanStartTime").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateTrigger(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CreateOrUpdateTrigger and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = client.CreateOrUpdateTrigger(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdateTrigger(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateTrigger with all request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateTrigger with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
-
-var data = new {
-    properties = new {
-        recurrence = new {
-            frequency = "Week",
-            interval = 1234,
-            startTime = "2022-05-10T18:57:31.2311892Z",
-            endTime = "2022-05-10T18:57:31.2311892Z",
-            schedule = new {
-                additionalProperties = new {
-                    key = new {},
-                },
-                minutes = new[] {
-                    1234
-                },
-                hours = new[] {
-                    1234
-                },
-                weekDays = new[] {
-                    "Sunday"
-                },
-                monthDays = new[] {
-                    1234
-                },
-                monthlyOccurrences = new[] {
-                    new {
-                        additionalProperties = new {
-                            key = new {},
-                        },
-                        day = "Sunday",
-                        occurrence = 1234,
-                    }
-                },
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["recurrence"] = new Dictionary<string, object>()
+        {
+            ["frequency"] = "Week",
+            ["interval"] = 1234,
+            ["startTime"] = "2022-05-10T18:57:31.2311892Z",
+            ["endTime"] = "2022-05-10T18:57:31.2311892Z",
+            ["schedule"] = new Dictionary<string, object>()
+            {
+                ["additionalProperties"] = new Dictionary<string, object>()
+                {
+                    ["key"] = new Dictionary<string, object>(),
+                },
+                ["minutes"] = new List<object>()
+{
+1234
+},
+                ["hours"] = new List<object>()
+{
+1234
+},
+                ["weekDays"] = new List<object>()
+{
+"Sunday"
+},
+                ["monthDays"] = new List<object>()
+{
+1234
+},
+                ["monthlyOccurrences"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["additionalProperties"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["day"] = "Sunday",
+["occurrence"] = 1234,
+}
+},
             },
-            timeZone = "<timeZone>",
+            ["timeZone"] = "<timeZone>",
         },
-        recurrenceInterval = "<recurrenceInterval>",
-        scanLevel = "Full",
-        incrementalScanStartTime = "2022-05-10T18:57:31.2311892Z",
+        ["recurrenceInterval"] = "<recurrenceInterval>",
+        ["scanLevel"] = "Full",
+        ["incrementalScanStartTime"] = "2022-05-10T18:57:31.2311892Z",
     },
-};
-
-Response response = client.CreateOrUpdateTrigger(RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdateTrigger(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("frequency").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("interval").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("minutes")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("hours")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("weekDays")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthDays")[0].ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("day").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("occurrence").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("timeZone").ToString());
@@ -1776,30 +1091,40 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("scanLevel").ToSt
 Console.WriteLine(result.GetProperty("properties").GetProperty("incrementalScanStartTime").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteTriggerAsync(RequestContext)">
-<example>
-This sample shows how to call DeleteTriggerAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteTriggerAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+Response response = await client.DeleteTriggerAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteTriggerAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = await client.DeleteTriggerAsync(new RequestContext());
+Response response = await client.DeleteTriggerAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("frequency").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("interval").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("minutes")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("hours")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("weekDays")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthDays")[0].ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("day").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("occurrence").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("timeZone").ToString());
@@ -1811,30 +1136,40 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("scanLevel").ToSt
 Console.WriteLine(result.GetProperty("properties").GetProperty("incrementalScanStartTime").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteTrigger(RequestContext)">
-<example>
-This sample shows how to call DeleteTrigger with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteTrigger and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-Response response = client.DeleteTrigger(new RequestContext());
+Response response = client.DeleteTrigger(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteTrigger with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+Response response = client.DeleteTrigger(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("frequency").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("interval").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("endTime").ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("minutes")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("hours")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("weekDays")[0].ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthDays")[0].ToString());
-Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("day").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("occurrence").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("timeZone").ToString());
@@ -1846,88 +1181,109 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("scanLevel").ToSt
 Console.WriteLine(result.GetProperty("properties").GetProperty("incrementalScanStartTime").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRunsAsync(RequestContext)">
-<example>
-This sample shows how to call GetRunsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRunsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-await foreach (var item in client.GetRunsAsync(new RequestContext()))
+await foreach (BinaryData item in client.GetRunsAsync(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("resourceId").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("assetsDiscovered").ToString());
-    Console.WriteLine(result.GetProperty("assetsClassified").ToString());
-    Console.WriteLine(result.GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("startTime").ToString());
-    Console.WriteLine(result.GetProperty("queuedTime").ToString());
-    Console.WriteLine(result.GetProperty("pipelineStartTime").ToString());
-    Console.WriteLine(result.GetProperty("endTime").ToString());
-    Console.WriteLine(result.GetProperty("scanRulesetVersion").ToString());
-    Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-    Console.WriteLine(result.GetProperty("scanLevelType").ToString());
-    Console.WriteLine(result.GetProperty("errorMessage").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("runType").ToString());
-    Console.WriteLine(result.GetProperty("dataSourceType").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetRunsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+await foreach (BinaryData item in client.GetRunsAsync(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("assetsDiscovered").ToString());
+    Console.WriteLine(result[0].GetProperty("assetsClassified").ToString());
+    Console.WriteLine(result[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("queuedTime").ToString());
+    Console.WriteLine(result[0].GetProperty("pipelineStartTime").ToString());
+    Console.WriteLine(result[0].GetProperty("endTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scanRulesetVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+    Console.WriteLine(result[0].GetProperty("scanLevelType").ToString());
+    Console.WriteLine(result[0].GetProperty("errorMessage").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("runType").ToString());
+    Console.WriteLine(result[0].GetProperty("dataSourceType").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetRuns(RequestContext)">
-<example>
-This sample shows how to call GetRuns with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRuns and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-foreach (var item in client.GetRuns(new RequestContext()))
+foreach (BinaryData item in client.GetRuns(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("resourceId").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("assetsDiscovered").ToString());
-    Console.WriteLine(result.GetProperty("assetsClassified").ToString());
-    Console.WriteLine(result.GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("startTime").ToString());
-    Console.WriteLine(result.GetProperty("queuedTime").ToString());
-    Console.WriteLine(result.GetProperty("pipelineStartTime").ToString());
-    Console.WriteLine(result.GetProperty("endTime").ToString());
-    Console.WriteLine(result.GetProperty("scanRulesetVersion").ToString());
-    Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-    Console.WriteLine(result.GetProperty("scanLevelType").ToString());
-    Console.WriteLine(result.GetProperty("errorMessage").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("runType").ToString());
-    Console.WriteLine(result.GetProperty("dataSourceType").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetRuns with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
+
+foreach (BinaryData item in client.GetRuns(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("assetsDiscovered").ToString());
+    Console.WriteLine(result[0].GetProperty("assetsClassified").ToString());
+    Console.WriteLine(result[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("queuedTime").ToString());
+    Console.WriteLine(result[0].GetProperty("pipelineStartTime").ToString());
+    Console.WriteLine(result[0].GetProperty("endTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scanRulesetVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+    Console.WriteLine(result[0].GetProperty("scanLevelType").ToString());
+    Console.WriteLine(result[0].GetProperty("errorMessage").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("runType").ToString());
+    Console.WriteLine(result[0].GetProperty("dataSourceType").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewScanningServiceClient.xml b/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewScanningServiceClient.xml
index 6f123fabf49c..d0e8345bb5a2 100644
--- a/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewScanningServiceClient.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Scanning/src/Generated/Docs/PurviewScanningServiceClient.xml
@@ -2,162 +2,212 @@
 <doc>
   <members>
     <member name="GetKeyVaultReferenceAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetKeyVaultReferenceAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetKeyVaultReferenceAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = await client.GetKeyVaultReferenceAsync("<keyVaultName>", new RequestContext());
+Response response = await client.GetKeyVaultReferenceAsync("<keyVaultName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetKeyVaultReferenceAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+Response response = await client.GetKeyVaultReferenceAsync("<keyVaultName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetKeyVaultReference(string,RequestContext)">
-<example>
-This sample shows how to call GetKeyVaultReference with required parameters and parse the result.
+      <example>
+This sample shows how to call GetKeyVaultReference and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+Response response = client.GetKeyVaultReference("<keyVaultName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetKeyVaultReference with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = client.GetKeyVaultReference("<keyVaultName>", new RequestContext());
+Response response = client.GetKeyVaultReference("<keyVaultName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateKeyVaultReferenceAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateKeyVaultReferenceAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateKeyVaultReferenceAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = await client.CreateOrUpdateKeyVaultReferenceAsync("<keyVaultName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CreateOrUpdateKeyVaultReferenceAsync("<keyVaultName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateKeyVaultReferenceAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateKeyVaultReferenceAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-var data = new {
-    properties = new {
-        baseUrl = "<baseUrl>",
-        description = "<description>",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["baseUrl"] = "<baseUrl>",
+        ["description"] = "<description>",
     },
-};
-
-Response response = await client.CreateOrUpdateKeyVaultReferenceAsync("<keyVaultName>", RequestContent.Create(data));
+});
+Response response = await client.CreateOrUpdateKeyVaultReferenceAsync("<keyVaultName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateKeyVaultReference(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateKeyVaultReference with required parameters and parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateKeyVaultReference and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-var data = new {};
-
-Response response = client.CreateOrUpdateKeyVaultReference("<keyVaultName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CreateOrUpdateKeyVaultReference("<keyVaultName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateKeyVaultReference with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrUpdateKeyVaultReference with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-var data = new {
-    properties = new {
-        baseUrl = "<baseUrl>",
-        description = "<description>",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["baseUrl"] = "<baseUrl>",
+        ["description"] = "<description>",
     },
-};
-
-Response response = client.CreateOrUpdateKeyVaultReference("<keyVaultName>", RequestContent.Create(data));
+});
+Response response = client.CreateOrUpdateKeyVaultReference("<keyVaultName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteKeyVaultReferenceAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteKeyVaultReferenceAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteKeyVaultReferenceAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+Response response = await client.DeleteKeyVaultReferenceAsync("<keyVaultName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteKeyVaultReferenceAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = await client.DeleteKeyVaultReferenceAsync("<keyVaultName>", new RequestContext());
+Response response = await client.DeleteKeyVaultReferenceAsync("<keyVaultName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteKeyVaultReference(string,RequestContext)">
-<example>
-This sample shows how to call DeleteKeyVaultReference with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteKeyVaultReference and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+Response response = client.DeleteKeyVaultReference("<keyVaultName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteKeyVaultReference with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = client.DeleteKeyVaultReference("<keyVaultName>", new RequestContext());
+Response response = client.DeleteKeyVaultReference("<keyVaultName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
 Console.WriteLine(result.GetProperty("properties").GetProperty("description").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetScanRulesetAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetScanRulesetAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetScanRulesetAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = await client.GetScanRulesetAsync("<scanRulesetName>", new RequestContext());
+Response response = await client.GetScanRulesetAsync("<scanRulesetName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetScanRulesetAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+Response response = await client.GetScanRulesetAsync("<scanRulesetName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -166,18 +216,29 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetScanRuleset(string,RequestContext)">
-<example>
-This sample shows how to call GetScanRuleset with required parameters and parse the result.
+      <example>
+This sample shows how to call GetScanRuleset and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+Response response = client.GetScanRuleset("<scanRulesetName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetScanRuleset with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = client.GetScanRuleset("<scanRulesetName>", new RequestContext());
+Response response = client.GetScanRuleset("<scanRulesetName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -186,48 +247,47 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateScanRulesetAsync(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateScanRulesetAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateScanRulesetAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
-
-var data = new {
-    kind = "AzureSubscription",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = await client.CreateOrUpdateScanRulesetAsync("<scanRulesetName>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = await client.CreateOrUpdateScanRulesetAsync("<scanRulesetName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateScanRulesetAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
-
-var data = new {
-    properties = new {
-        description = "<description>",
-        excludedSystemClassifications = new[] {
-            "<String>"
-        },
-        includedCustomClassificationRuleNames = new[] {
-            "<String>"
-        },
-    },
-    kind = "AzureSubscription",
-    scanRulesetType = "Custom",
-};
+This sample shows how to call CreateOrUpdateScanRulesetAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = await client.CreateOrUpdateScanRulesetAsync("<scanRulesetName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["description"] = "<description>",
+        ["excludedSystemClassifications"] = new List<object>()
+{
+"<excludedSystemClassifications>"
+},
+        ["includedCustomClassificationRuleNames"] = new List<object>()
+{
+"<includedCustomClassificationRuleNames>"
+},
+    },
+    ["kind"] = "AzureSubscription",
+    ["scanRulesetType"] = "Custom",
+});
+Response response = await client.CreateOrUpdateScanRulesetAsync("<scanRulesetName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -236,48 +296,47 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrUpdateScanRuleset(string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrUpdateScanRuleset with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrUpdateScanRuleset and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-var data = new {
-    kind = "AzureSubscription",
-};
-
-Response response = client.CreateOrUpdateScanRuleset("<scanRulesetName>", RequestContent.Create(data));
+RequestContent content = null;
+Response response = client.CreateOrUpdateScanRuleset("<scanRulesetName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrUpdateScanRuleset with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
-
-var data = new {
-    properties = new {
-        description = "<description>",
-        excludedSystemClassifications = new[] {
-            "<String>"
-        },
-        includedCustomClassificationRuleNames = new[] {
-            "<String>"
-        },
-    },
-    kind = "AzureSubscription",
-    scanRulesetType = "Custom",
-};
+This sample shows how to call CreateOrUpdateScanRuleset with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = client.CreateOrUpdateScanRuleset("<scanRulesetName>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["description"] = "<description>",
+        ["excludedSystemClassifications"] = new List<object>()
+{
+"<excludedSystemClassifications>"
+},
+        ["includedCustomClassificationRuleNames"] = new List<object>()
+{
+"<includedCustomClassificationRuleNames>"
+},
+    },
+    ["kind"] = "AzureSubscription",
+    ["scanRulesetType"] = "Custom",
+});
+Response response = client.CreateOrUpdateScanRuleset("<scanRulesetName>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -286,18 +345,29 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteScanRulesetAsync(string,RequestContext)">
-<example>
-This sample shows how to call DeleteScanRulesetAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteScanRulesetAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+Response response = await client.DeleteScanRulesetAsync("<scanRulesetName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteScanRulesetAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = await client.DeleteScanRulesetAsync("<scanRulesetName>", new RequestContext());
+Response response = await client.DeleteScanRulesetAsync("<scanRulesetName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -306,18 +376,29 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteScanRuleset(string,RequestContext)">
-<example>
-This sample shows how to call DeleteScanRuleset with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteScanRuleset and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+Response response = client.DeleteScanRuleset("<scanRulesetName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call DeleteScanRuleset with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = client.DeleteScanRuleset("<scanRulesetName>", new RequestContext());
+Response response = client.DeleteScanRuleset("<scanRulesetName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -326,18 +407,29 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetSystemRulesetsForDataSourceAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetSystemRulesetsForDataSourceAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSystemRulesetsForDataSourceAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = await client.GetSystemRulesetsForDataSourceAsync("<dataSourceType>", new RequestContext());
+Response response = await client.GetSystemRulesetsForDataSourceAsync("None", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSystemRulesetsForDataSourceAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+Response response = await client.GetSystemRulesetsForDataSourceAsync("None", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -346,18 +438,29 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetSystemRulesetsForDataSource(string,RequestContext)">
-<example>
-This sample shows how to call GetSystemRulesetsForDataSource with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSystemRulesetsForDataSource and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+Response response = client.GetSystemRulesetsForDataSource("None", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSystemRulesetsForDataSource with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = client.GetSystemRulesetsForDataSource("<dataSourceType>", new RequestContext());
+Response response = client.GetSystemRulesetsForDataSource("None", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -366,18 +469,29 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetSystemRulesetsForVersionAsync(int,string,RequestContext)">
-<example>
-This sample shows how to call GetSystemRulesetsForVersionAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSystemRulesetsForVersionAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+Response response = await client.GetSystemRulesetsForVersionAsync(1234, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSystemRulesetsForVersionAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = await client.GetSystemRulesetsForVersionAsync(1234, "<dataSourceType>", new RequestContext());
+Response response = await client.GetSystemRulesetsForVersionAsync(1234, "None", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -386,18 +500,29 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetSystemRulesetsForVersion(int,string,RequestContext)">
-<example>
-This sample shows how to call GetSystemRulesetsForVersion with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSystemRulesetsForVersion and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = client.GetSystemRulesetsForVersion(1234, "<dataSourceType>", new RequestContext());
+Response response = client.GetSystemRulesetsForVersion(1234, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSystemRulesetsForVersion with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+Response response = client.GetSystemRulesetsForVersion(1234, "None", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -406,18 +531,29 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetLatestSystemRulesetsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetLatestSystemRulesetsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLatestSystemRulesetsAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+Response response = await client.GetLatestSystemRulesetsAsync(null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetLatestSystemRulesetsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = await client.GetLatestSystemRulesetsAsync("<dataSourceType>", new RequestContext());
+Response response = await client.GetLatestSystemRulesetsAsync("None", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -426,18 +562,29 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetLatestSystemRulesets(string,RequestContext)">
-<example>
-This sample shows how to call GetLatestSystemRulesets with required parameters and parse the result.
+      <example>
+This sample shows how to call GetLatestSystemRulesets and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+Response response = client.GetLatestSystemRulesets(null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("kind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetLatestSystemRulesets with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-Response response = client.GetLatestSystemRulesets("<dataSourceType>", new RequestContext());
+Response response = client.GetLatestSystemRulesets("None", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("kind").ToString());
@@ -446,300 +593,441 @@ Console.WriteLine(result.GetProperty("status").ToString());
 Console.WriteLine(result.GetProperty("version").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetKeyVaultReferencesAsync(RequestContext)">
-<example>
-This sample shows how to call GetKeyVaultReferencesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetKeyVaultReferencesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-await foreach (var item in client.GetKeyVaultReferencesAsync(new RequestContext()))
+await foreach (BinaryData item in client.GetKeyVaultReferencesAsync(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetKeyVaultReferencesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetKeyVaultReferencesAsync(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("baseUrl").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetKeyVaultReferences(RequestContext)">
-<example>
-This sample shows how to call GetKeyVaultReferences with required parameters and parse the result.
+      <example>
+This sample shows how to call GetKeyVaultReferences and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-foreach (var item in client.GetKeyVaultReferences(new RequestContext()))
+foreach (BinaryData item in client.GetKeyVaultReferences(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
-    Console.WriteLine(result.GetProperty("properties").GetProperty("description").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetKeyVaultReferences with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetKeyVaultReferences(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("baseUrl").ToString());
+    Console.WriteLine(result[0].GetProperty("properties").GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetClassificationRulesAsync(RequestContext)">
-<example>
-This sample shows how to call GetClassificationRulesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetClassificationRulesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-await foreach (var item in client.GetClassificationRulesAsync(new RequestContext()))
+await foreach (BinaryData item in client.GetClassificationRulesAsync(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetClassificationRulesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetClassificationRulesAsync(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetClassificationRules(RequestContext)">
-<example>
-This sample shows how to call GetClassificationRules with required parameters and parse the result.
+      <example>
+This sample shows how to call GetClassificationRules and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-foreach (var item in client.GetClassificationRules(new RequestContext()))
+foreach (BinaryData item in client.GetClassificationRules(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetClassificationRules with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetClassificationRules(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetDataSourcesAsync(RequestContext)">
-<example>
-This sample shows how to call GetDataSourcesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDataSourcesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-await foreach (var item in client.GetDataSourcesAsync(new RequestContext()))
+await foreach (BinaryData item in client.GetDataSourcesAsync(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("endTime").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("runType").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetDataSourcesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetDataSourcesAsync(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("endTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("runType").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetDataSources(RequestContext)">
-<example>
-This sample shows how to call GetDataSources with required parameters and parse the result.
+      <example>
+This sample shows how to call GetDataSources and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-foreach (var item in client.GetDataSources(new RequestContext()))
+foreach (BinaryData item in client.GetDataSources(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("parentId").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("endTime").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("runType").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("scans")[0].GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetDataSources with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetDataSources(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("parentId").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("endTime").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("runType").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetScanRulesetsAsync(RequestContext)">
-<example>
-This sample shows how to call GetScanRulesetsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetScanRulesetsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-await foreach (var item in client.GetScanRulesetsAsync(new RequestContext()))
+await foreach (BinaryData item in client.GetScanRulesetsAsync(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetScanRulesetsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetScanRulesetsAsync(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetScanRulesets(RequestContext)">
-<example>
-This sample shows how to call GetScanRulesets with required parameters and parse the result.
+      <example>
+This sample shows how to call GetScanRulesets and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-foreach (var item in client.GetScanRulesets(new RequestContext()))
+foreach (BinaryData item in client.GetScanRulesets(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetScanRulesets with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetScanRulesets(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSystemRulesetsAsync(RequestContext)">
-<example>
-This sample shows how to call GetSystemRulesetsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSystemRulesetsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-await foreach (var item in client.GetSystemRulesetsAsync(new RequestContext()))
+await foreach (BinaryData item in client.GetSystemRulesetsAsync(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSystemRulesetsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetSystemRulesetsAsync(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSystemRulesets(RequestContext)">
-<example>
-This sample shows how to call GetSystemRulesets with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSystemRulesets and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-foreach (var item in client.GetSystemRulesets(new RequestContext()))
+foreach (BinaryData item in client.GetSystemRulesets(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSystemRulesets with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetSystemRulesets(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSystemRulesetsVersionsAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetSystemRulesetsVersionsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSystemRulesetsVersionsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-await foreach (var item in client.GetSystemRulesetsVersionsAsync("<dataSourceType>", new RequestContext()))
+await foreach (BinaryData item in client.GetSystemRulesetsVersionsAsync(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSystemRulesetsVersionsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetSystemRulesetsVersionsAsync("None", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetSystemRulesetsVersions(string,RequestContext)">
-<example>
-This sample shows how to call GetSystemRulesetsVersions with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSystemRulesetsVersions and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewScanningServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-foreach (var item in client.GetSystemRulesetsVersions("<dataSourceType>", new RequestContext()))
+foreach (BinaryData item in client.GetSystemRulesetsVersions(null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("kind").ToString());
-    Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("version").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetSystemRulesetsVersions with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetSystemRulesetsVersions("None", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("kind").ToString());
+    Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("version").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewClassificationRuleClient.cs b/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewClassificationRuleClient.cs
index e53a45bfba02..df3c7afde5e6 100644
--- a/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewClassificationRuleClient.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewClassificationRuleClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Scanning;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +23,11 @@ public class Samples_PurviewClassificationRuleClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProperties()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            Response response = client.GetProperties(new RequestContext());
+            Response response = client.GetProperties(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -38,11 +38,11 @@ public void Example_GetProperties()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProperties_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            Response response = client.GetProperties(new RequestContext());
+            Response response = client.GetProperties(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -54,11 +54,11 @@ public void Example_GetProperties_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProperties_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            Response response = await client.GetPropertiesAsync(new RequestContext());
+            Response response = await client.GetPropertiesAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -69,11 +69,11 @@ public async Task Example_GetProperties_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProperties_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            Response response = await client.GetPropertiesAsync(new RequestContext());
+            Response response = await client.GetPropertiesAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -85,16 +85,12 @@ public async Task Example_GetProperties_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            var data = new
-            {
-                kind = "System",
-            };
-
-            Response response = client.CreateOrUpdate(RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.CreateOrUpdate(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -105,22 +101,21 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    description = "<description>",
-                    classificationName = "<classificationName>",
-                    ruleStatus = "Enabled",
+                    ["description"] = "<description>",
+                    ["classificationName"] = "<classificationName>",
+                    ["ruleStatus"] = "Enabled",
                 },
-                kind = "System",
-            };
-
-            Response response = client.CreateOrUpdate(RequestContent.Create(data));
+                ["kind"] = "System",
+            });
+            Response response = client.CreateOrUpdate(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -132,16 +127,12 @@ public void Example_CreateOrUpdate_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            var data = new
-            {
-                kind = "System",
-            };
-
-            Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.CreateOrUpdateAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -152,22 +143,21 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    description = "<description>",
-                    classificationName = "<classificationName>",
-                    ruleStatus = "Enabled",
+                    ["description"] = "<description>",
+                    ["classificationName"] = "<classificationName>",
+                    ["ruleStatus"] = "Enabled",
                 },
-                kind = "System",
-            };
-
-            Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+                ["kind"] = "System",
+            });
+            Response response = await client.CreateOrUpdateAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -179,11 +169,11 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            Response response = client.Delete(new RequestContext());
+            Response response = client.Delete(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -194,11 +184,11 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            Response response = client.Delete(new RequestContext());
+            Response response = client.Delete(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -210,11 +200,11 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            Response response = await client.DeleteAsync(new RequestContext());
+            Response response = await client.DeleteAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -225,11 +215,11 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            Response response = await client.DeleteAsync(new RequestContext());
+            Response response = await client.DeleteAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -241,11 +231,11 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_TagVersion()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            Response response = client.TagVersion(1234, "<action>", new RequestContext());
+            Response response = client.TagVersion(1234, "Keep", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -255,11 +245,11 @@ public void Example_TagVersion()
         [Ignore("Only validating compilation of examples")]
         public void Example_TagVersion_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            Response response = client.TagVersion(1234, "<action>", new RequestContext());
+            Response response = client.TagVersion(1234, "Keep", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("scanResultId").ToString());
@@ -278,11 +268,11 @@ public void Example_TagVersion_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_TagVersion_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            Response response = await client.TagVersionAsync(1234, "<action>", new RequestContext());
+            Response response = await client.TagVersionAsync(1234, "Keep", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -292,11 +282,11 @@ public async Task Example_TagVersion_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_TagVersion_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            Response response = await client.TagVersionAsync(1234, "<action>", new RequestContext());
+            Response response = await client.TagVersionAsync(1234, "Keep", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("scanResultId").ToString());
@@ -315,15 +305,15 @@ public async Task Example_TagVersion_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetVersions()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            foreach (var item in client.GetVersions(new RequestContext()))
+            foreach (BinaryData item in client.GetVersions(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -331,16 +321,16 @@ public void Example_GetVersions()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetVersions_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            foreach (var item in client.GetVersions(new RequestContext()))
+            foreach (BinaryData item in client.GetVersions(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -348,15 +338,15 @@ public void Example_GetVersions_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetVersions_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            await foreach (var item in client.GetVersionsAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetVersionsAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -364,16 +354,16 @@ public async Task Example_GetVersions_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetVersions_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewClassificationRuleClient(endpoint, "<classificationRuleName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewClassificationRuleClient client = new PurviewClassificationRuleClient(endpoint, "<ClassificationRuleName>", credential);
 
-            await foreach (var item in client.GetVersionsAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetVersionsAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
     }
diff --git a/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewDataSourceClient.cs b/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewDataSourceClient.cs
index 1c11b3f9b6da..87fd5f775727 100644
--- a/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewDataSourceClient.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewDataSourceClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Scanning;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,16 +23,12 @@ public class Samples_PurviewDataSourceClient
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            var data = new
-            {
-                kind = "AzureSubscription",
-            };
-
-            Response response = client.CreateOrUpdate(RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.CreateOrUpdate(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -43,24 +39,23 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    subscriptionId = "<subscriptionId>",
-                    collection = new
+                    ["subscriptionId"] = "<subscriptionId>",
+                    ["collection"] = new Dictionary<string, object>()
                     {
-                        referenceName = "<referenceName>",
+                        ["referenceName"] = "<referenceName>",
                     },
                 },
-                kind = "AzureSubscription",
-            };
-
-            Response response = client.CreateOrUpdate(RequestContent.Create(data));
+                ["kind"] = "AzureSubscription",
+            });
+            Response response = client.CreateOrUpdate(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -73,7 +68,7 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-            Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -100,16 +95,12 @@ public void Example_CreateOrUpdate_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            var data = new
-            {
-                kind = "AzureSubscription",
-            };
-
-            Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.CreateOrUpdateAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -120,24 +111,23 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    subscriptionId = "<subscriptionId>",
-                    collection = new
+                    ["subscriptionId"] = "<subscriptionId>",
+                    ["collection"] = new Dictionary<string, object>()
                     {
-                        referenceName = "<referenceName>",
+                        ["referenceName"] = "<referenceName>",
                     },
                 },
-                kind = "AzureSubscription",
-            };
-
-            Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+                ["kind"] = "AzureSubscription",
+            });
+            Response response = await client.CreateOrUpdateAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -150,7 +140,7 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-            Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -177,11 +167,11 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProperties()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            Response response = client.GetProperties(new RequestContext());
+            Response response = client.GetProperties(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -192,11 +182,11 @@ public void Example_GetProperties()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProperties_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            Response response = client.GetProperties(new RequestContext());
+            Response response = client.GetProperties(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -209,7 +199,7 @@ public void Example_GetProperties_AllParameters()
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-            Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -236,11 +226,11 @@ public void Example_GetProperties_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProperties_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            Response response = await client.GetPropertiesAsync(new RequestContext());
+            Response response = await client.GetPropertiesAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -251,11 +241,11 @@ public async Task Example_GetProperties_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProperties_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            Response response = await client.GetPropertiesAsync(new RequestContext());
+            Response response = await client.GetPropertiesAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -268,7 +258,7 @@ public async Task Example_GetProperties_AllParameters_Async()
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-            Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -295,11 +285,11 @@ public async Task Example_GetProperties_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            Response response = client.Delete(new RequestContext());
+            Response response = client.Delete(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -310,11 +300,11 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            Response response = client.Delete(new RequestContext());
+            Response response = client.Delete(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -327,7 +317,7 @@ public void Example_Delete_AllParameters()
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-            Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -354,11 +344,11 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            Response response = await client.DeleteAsync(new RequestContext());
+            Response response = await client.DeleteAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -369,11 +359,11 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            Response response = await client.DeleteAsync(new RequestContext());
+            Response response = await client.DeleteAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -386,7 +376,7 @@ public async Task Example_Delete_AllParameters_Async()
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-            Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
             Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -413,15 +403,15 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetScans()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            foreach (var item in client.GetScans(new RequestContext()))
+            foreach (BinaryData item in client.GetScans(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -429,41 +419,41 @@ public void Example_GetScans()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetScans_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            foreach (var item in client.GetScans(new RequestContext()))
+            foreach (BinaryData item in client.GetScans(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("endTime").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("runType").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("endTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("runType").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -471,15 +461,15 @@ public void Example_GetScans_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetScans_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            await foreach (var item in client.GetScansAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetScansAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -487,41 +477,41 @@ public async Task Example_GetScans_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetScans_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewDataSourceClient(endpoint, "<dataSourceName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewDataSourceClient client = new PurviewDataSourceClient(endpoint, "<DataSourceName>", credential);
 
-            await foreach (var item in client.GetScansAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetScansAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("endTime").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("runType").ToString());
-                Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("endTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("runType").ToString());
+                Console.WriteLine(result[0].GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
     }
diff --git a/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewScanClient.cs b/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewScanClient.cs
index 119c5cd84642..22d770ca3348 100644
--- a/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewScanClient.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewScanClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Scanning;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +23,11 @@ public class Samples_PurviewScanClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFilter()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.GetFilter(new RequestContext());
+            Response response = client.GetFilter(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -37,11 +37,11 @@ public void Example_GetFilter()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetFilter_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.GetFilter(new RequestContext());
+            Response response = client.GetFilter(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("excludeUriPrefixes")[0].ToString());
@@ -54,11 +54,11 @@ public void Example_GetFilter_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFilter_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.GetFilterAsync(new RequestContext());
+            Response response = await client.GetFilterAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -68,11 +68,11 @@ public async Task Example_GetFilter_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetFilter_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.GetFilterAsync(new RequestContext());
+            Response response = await client.GetFilterAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("excludeUriPrefixes")[0].ToString());
@@ -85,13 +85,12 @@ public async Task Example_GetFilter_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateFilter()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdateFilter(RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.CreateOrUpdateFilter(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -101,24 +100,25 @@ public void Example_CreateOrUpdateFilter()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateFilter_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    excludeUriPrefixes = new[] {
-            "<String>"
-        },
-                    includeUriPrefixes = new[] {
-            "<String>"
-        },
+                    ["excludeUriPrefixes"] = new List<object>()
+{
+"<excludeUriPrefixes>"
+},
+                    ["includeUriPrefixes"] = new List<object>()
+{
+"<includeUriPrefixes>"
+},
                 },
-            };
-
-            Response response = client.CreateOrUpdateFilter(RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateFilter(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("excludeUriPrefixes")[0].ToString());
@@ -131,13 +131,12 @@ public void Example_CreateOrUpdateFilter_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateFilter_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateFilterAsync(RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.CreateOrUpdateFilterAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -147,24 +146,25 @@ public async Task Example_CreateOrUpdateFilter_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateFilter_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    excludeUriPrefixes = new[] {
-            "<String>"
-        },
-                    includeUriPrefixes = new[] {
-            "<String>"
-        },
+                    ["excludeUriPrefixes"] = new List<object>()
+{
+"<excludeUriPrefixes>"
+},
+                    ["includeUriPrefixes"] = new List<object>()
+{
+"<includeUriPrefixes>"
+},
                 },
-            };
-
-            Response response = await client.CreateOrUpdateFilterAsync(RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateFilterAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("excludeUriPrefixes")[0].ToString());
@@ -177,16 +177,15 @@ public async Task Example_CreateOrUpdateFilter_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                kind = "AzureSubscriptionCredential",
-            };
-
-            Response response = client.CreateOrUpdate(RequestContent.Create(data));
+                ["kind"] = "AzureSubscriptionCredential",
+            });
+            Response response = client.CreateOrUpdate(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -197,610 +196,112 @@ public void Example_CreateOrUpdate()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdate_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    resourceTypes = new
+                    ["resourceTypes"] = new Dictionary<string, object>()
                     {
-                        None = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureSubscription = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureResourceGroup = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureSynapseWorkspace = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureSynapse = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AdlsGen1 = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AdlsGen2 = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AmazonAccount = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AmazonS3 = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AmazonSql = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureCosmosDb = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureDataExplorer = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureFileService = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureSqlDatabase = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AmazonPostgreSql = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzurePostgreSql = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        SqlServerDatabase = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureSqlDatabaseManagedInstance = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureSqlDataWarehouse = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureMySql = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureStorage = new
+                        ["None"] = new Dictionary<string, object>()
                         {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
+                            ["scanRulesetName"] = "<scanRulesetName>",
+                            ["scanRulesetType"] = "Custom",
+                            ["resourceNameFilter"] = new Dictionary<string, object>()
                             {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        Teradata = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        Oracle = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        SapS4Hana = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        SapEcc = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        PowerBI = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
+                                ["excludePrefixes"] = new List<object>()
+{
+"<excludePrefixes>"
+},
+                                ["includePrefixes"] = new List<object>()
+{
+"<includePrefixes>"
+},
+                                ["resources"] = new List<object>()
+{
+"<resources>"
+},
                             },
-                            credential = new
+                            ["credential"] = new Dictionary<string, object>()
                             {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
+                                ["referenceName"] = "<referenceName>",
+                                ["credentialType"] = "AccountKey",
                             },
                         },
-                    },
-                    credential = new
+                        ["AzureSubscription"] = null
+            ,
+                        ["AzureResourceGroup"] = null
+            ,
+                        ["AzureSynapseWorkspace"] = null
+            ,
+                        ["AzureSynapse"] = null
+            ,
+                        ["AdlsGen1"] = null
+            ,
+                        ["AdlsGen2"] = null
+            ,
+                        ["AmazonAccount"] = null
+            ,
+                        ["AmazonS3"] = null
+            ,
+                        ["AmazonSql"] = null
+            ,
+                        ["AzureCosmosDb"] = null
+            ,
+                        ["AzureDataExplorer"] = null
+            ,
+                        ["AzureFileService"] = null
+            ,
+                        ["AzureSqlDatabase"] = null
+            ,
+                        ["AmazonPostgreSql"] = null
+            ,
+                        ["AzurePostgreSql"] = null
+            ,
+                        ["SqlServerDatabase"] = null
+            ,
+                        ["AzureSqlDatabaseManagedInstance"] = null
+            ,
+                        ["AzureSqlDataWarehouse"] = null
+            ,
+                        ["AzureMySql"] = null
+            ,
+                        ["AzureStorage"] = null
+            ,
+                        ["Teradata"] = null
+            ,
+                        ["Oracle"] = null
+            ,
+                        ["SapS4Hana"] = null
+            ,
+                        ["SapEcc"] = null
+            ,
+                        ["PowerBI"] = null
+            ,
+                    },
+                    ["credential"] = new Dictionary<string, object>()
                     {
-                        referenceName = "<referenceName>",
-                        credentialType = "AccountKey",
+                        ["referenceName"] = "<referenceName>",
+                        ["credentialType"] = "AccountKey",
                     },
-                    scanRulesetName = "<scanRulesetName>",
-                    scanRulesetType = "Custom",
-                    collection = new
+                    ["scanRulesetName"] = "<scanRulesetName>",
+                    ["scanRulesetType"] = "Custom",
+                    ["collection"] = new Dictionary<string, object>()
                     {
-                        referenceName = "<referenceName>",
+                        ["referenceName"] = "<referenceName>",
                     },
-                    workers = 1234,
-                    connectedVia = new
+                    ["workers"] = 1234,
+                    ["connectedVia"] = new Dictionary<string, object>()
                     {
-                        referenceName = "<referenceName>",
+                        ["referenceName"] = "<referenceName>",
                     },
                 },
-                kind = "AzureSubscriptionCredential",
-            };
-
-            Response response = client.CreateOrUpdate(RequestContent.Create(data));
+                ["kind"] = "AzureSubscriptionCredential",
+            });
+            Response response = client.CreateOrUpdate(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -812,7 +313,7 @@ public void Example_CreateOrUpdate_AllParameters()
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-            Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -837,16 +338,15 @@ public void Example_CreateOrUpdate_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                kind = "AzureSubscriptionCredential",
-            };
-
-            Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+                ["kind"] = "AzureSubscriptionCredential",
+            });
+            Response response = await client.CreateOrUpdateAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -857,610 +357,112 @@ public async Task Example_CreateOrUpdate_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdate_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    resourceTypes = new
+                    ["resourceTypes"] = new Dictionary<string, object>()
                     {
-                        None = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureSubscription = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureResourceGroup = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureSynapseWorkspace = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureSynapse = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AdlsGen1 = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AdlsGen2 = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AmazonAccount = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AmazonS3 = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AmazonSql = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureCosmosDb = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureDataExplorer = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureFileService = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureSqlDatabase = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AmazonPostgreSql = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzurePostgreSql = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        SqlServerDatabase = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureSqlDatabaseManagedInstance = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureSqlDataWarehouse = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureMySql = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        AzureStorage = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        Teradata = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        Oracle = new
+                        ["None"] = new Dictionary<string, object>()
                         {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
+                            ["scanRulesetName"] = "<scanRulesetName>",
+                            ["scanRulesetType"] = "Custom",
+                            ["resourceNameFilter"] = new Dictionary<string, object>()
                             {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        SapS4Hana = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        SapEcc = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
-                            },
-                            credential = new
-                            {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
-                            },
-                        },
-                        PowerBI = new
-                        {
-                            scanRulesetName = "<scanRulesetName>",
-                            scanRulesetType = "Custom",
-                            resourceNameFilter = new
-                            {
-                                excludePrefixes = new[] {
-                        "<String>"
-                    },
-                                includePrefixes = new[] {
-                        "<String>"
-                    },
-                                resources = new[] {
-                        "<String>"
-                    },
+                                ["excludePrefixes"] = new List<object>()
+{
+"<excludePrefixes>"
+},
+                                ["includePrefixes"] = new List<object>()
+{
+"<includePrefixes>"
+},
+                                ["resources"] = new List<object>()
+{
+"<resources>"
+},
                             },
-                            credential = new
+                            ["credential"] = new Dictionary<string, object>()
                             {
-                                referenceName = "<referenceName>",
-                                credentialType = "AccountKey",
+                                ["referenceName"] = "<referenceName>",
+                                ["credentialType"] = "AccountKey",
                             },
                         },
-                    },
-                    credential = new
+                        ["AzureSubscription"] = null
+            ,
+                        ["AzureResourceGroup"] = null
+            ,
+                        ["AzureSynapseWorkspace"] = null
+            ,
+                        ["AzureSynapse"] = null
+            ,
+                        ["AdlsGen1"] = null
+            ,
+                        ["AdlsGen2"] = null
+            ,
+                        ["AmazonAccount"] = null
+            ,
+                        ["AmazonS3"] = null
+            ,
+                        ["AmazonSql"] = null
+            ,
+                        ["AzureCosmosDb"] = null
+            ,
+                        ["AzureDataExplorer"] = null
+            ,
+                        ["AzureFileService"] = null
+            ,
+                        ["AzureSqlDatabase"] = null
+            ,
+                        ["AmazonPostgreSql"] = null
+            ,
+                        ["AzurePostgreSql"] = null
+            ,
+                        ["SqlServerDatabase"] = null
+            ,
+                        ["AzureSqlDatabaseManagedInstance"] = null
+            ,
+                        ["AzureSqlDataWarehouse"] = null
+            ,
+                        ["AzureMySql"] = null
+            ,
+                        ["AzureStorage"] = null
+            ,
+                        ["Teradata"] = null
+            ,
+                        ["Oracle"] = null
+            ,
+                        ["SapS4Hana"] = null
+            ,
+                        ["SapEcc"] = null
+            ,
+                        ["PowerBI"] = null
+            ,
+                    },
+                    ["credential"] = new Dictionary<string, object>()
                     {
-                        referenceName = "<referenceName>",
-                        credentialType = "AccountKey",
+                        ["referenceName"] = "<referenceName>",
+                        ["credentialType"] = "AccountKey",
                     },
-                    scanRulesetName = "<scanRulesetName>",
-                    scanRulesetType = "Custom",
-                    collection = new
+                    ["scanRulesetName"] = "<scanRulesetName>",
+                    ["scanRulesetType"] = "Custom",
+                    ["collection"] = new Dictionary<string, object>()
                     {
-                        referenceName = "<referenceName>",
+                        ["referenceName"] = "<referenceName>",
                     },
-                    workers = 1234,
-                    connectedVia = new
+                    ["workers"] = 1234,
+                    ["connectedVia"] = new Dictionary<string, object>()
                     {
-                        referenceName = "<referenceName>",
+                        ["referenceName"] = "<referenceName>",
                     },
                 },
-                kind = "AzureSubscriptionCredential",
-            };
-
-            Response response = await client.CreateOrUpdateAsync(RequestContent.Create(data));
+                ["kind"] = "AzureSubscriptionCredential",
+            });
+            Response response = await client.CreateOrUpdateAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -1472,7 +474,7 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-            Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -1497,11 +499,11 @@ public async Task Example_CreateOrUpdate_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProperties()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.GetProperties(new RequestContext());
+            Response response = client.GetProperties(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -1512,11 +514,11 @@ public void Example_GetProperties()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetProperties_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.GetProperties(new RequestContext());
+            Response response = client.GetProperties(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -1528,7 +530,7 @@ public void Example_GetProperties_AllParameters()
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-            Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -1553,11 +555,11 @@ public void Example_GetProperties_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProperties_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.GetPropertiesAsync(new RequestContext());
+            Response response = await client.GetPropertiesAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -1568,11 +570,11 @@ public async Task Example_GetProperties_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetProperties_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.GetPropertiesAsync(new RequestContext());
+            Response response = await client.GetPropertiesAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -1584,7 +586,7 @@ public async Task Example_GetProperties_AllParameters_Async()
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-            Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -1609,11 +611,11 @@ public async Task Example_GetProperties_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.Delete(new RequestContext());
+            Response response = client.Delete(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -1624,11 +626,11 @@ public void Example_Delete()
         [Ignore("Only validating compilation of examples")]
         public void Example_Delete_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.Delete(new RequestContext());
+            Response response = client.Delete(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -1640,7 +642,7 @@ public void Example_Delete_AllParameters()
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-            Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -1665,11 +667,11 @@ public void Example_Delete_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.DeleteAsync(new RequestContext());
+            Response response = await client.DeleteAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -1680,11 +682,11 @@ public async Task Example_Delete_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_Delete_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.DeleteAsync(new RequestContext());
+            Response response = await client.DeleteAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -1696,7 +698,7 @@ public async Task Example_Delete_AllParameters_Async()
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-            Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
             Console.WriteLine(result.GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
@@ -1721,11 +723,11 @@ public async Task Example_Delete_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_RunScan()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.RunScan("<runId>", "<scanLevel>", new RequestContext());
+            Response response = client.RunScan("<runId>", null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1735,11 +737,11 @@ public void Example_RunScan()
         [Ignore("Only validating compilation of examples")]
         public void Example_RunScan_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.RunScan("<runId>", "<scanLevel>", new RequestContext());
+            Response response = client.RunScan("<runId>", "Full", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("scanResultId").ToString());
@@ -1758,11 +760,11 @@ public void Example_RunScan_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RunScan_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.RunScanAsync("<runId>", "<scanLevel>", new RequestContext());
+            Response response = await client.RunScanAsync("<runId>", null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1772,11 +774,11 @@ public async Task Example_RunScan_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RunScan_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.RunScanAsync("<runId>", "<scanLevel>", new RequestContext());
+            Response response = await client.RunScanAsync("<runId>", "Full", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("scanResultId").ToString());
@@ -1795,11 +797,11 @@ public async Task Example_RunScan_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CancelScan()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.CancelScan("<runId>", new RequestContext());
+            Response response = client.CancelScan("<runId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1809,11 +811,11 @@ public void Example_CancelScan()
         [Ignore("Only validating compilation of examples")]
         public void Example_CancelScan_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.CancelScan("<runId>", new RequestContext());
+            Response response = client.CancelScan("<runId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("scanResultId").ToString());
@@ -1832,11 +834,11 @@ public void Example_CancelScan_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CancelScan_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.CancelScanAsync("<runId>", new RequestContext());
+            Response response = await client.CancelScanAsync("<runId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1846,11 +848,11 @@ public async Task Example_CancelScan_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CancelScan_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.CancelScanAsync("<runId>", new RequestContext());
+            Response response = await client.CancelScanAsync("<runId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("scanResultId").ToString());
@@ -1869,11 +871,11 @@ public async Task Example_CancelScan_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTrigger()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.GetTrigger(new RequestContext());
+            Response response = client.GetTrigger(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1883,23 +885,23 @@ public void Example_GetTrigger()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetTrigger_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.GetTrigger(new RequestContext());
+            Response response = client.GetTrigger(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("frequency").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("interval").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("minutes")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("hours")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("weekDays")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthDays")[0].ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("day").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("occurrence").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("timeZone").ToString());
@@ -1917,11 +919,11 @@ public void Example_GetTrigger_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTrigger_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.GetTriggerAsync(new RequestContext());
+            Response response = await client.GetTriggerAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1931,23 +933,23 @@ public async Task Example_GetTrigger_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetTrigger_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.GetTriggerAsync(new RequestContext());
+            Response response = await client.GetTriggerAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("frequency").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("interval").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("minutes")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("hours")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("weekDays")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthDays")[0].ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("day").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("occurrence").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("timeZone").ToString());
@@ -1965,13 +967,12 @@ public async Task Example_GetTrigger_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateTrigger()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.CreateOrUpdateTrigger(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdateTrigger(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -1981,69 +982,75 @@ public void Example_CreateOrUpdateTrigger()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateTrigger_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    recurrence = new
+                    ["recurrence"] = new Dictionary<string, object>()
                     {
-                        frequency = "Week",
-                        interval = 1234,
-                        startTime = "2022-05-10T18:57:31.2311892Z",
-                        endTime = "2022-05-10T18:57:31.2311892Z",
-                        schedule = new
+                        ["frequency"] = "Week",
+                        ["interval"] = 1234,
+                        ["startTime"] = "2022-05-10T18:57:31.2311892Z",
+                        ["endTime"] = "2022-05-10T18:57:31.2311892Z",
+                        ["schedule"] = new Dictionary<string, object>()
                         {
-                            additionalProperties = new
+                            ["additionalProperties"] = new Dictionary<string, object>()
                             {
-                                key = new { },
+                                ["key"] = new Dictionary<string, object>(),
                             },
-                            minutes = new[] {
-                    1234
-                },
-                            hours = new[] {
-                    1234
-                },
-                            weekDays = new[] {
-                    "Sunday"
-                },
-                            monthDays = new[] {
-                    1234
-                },
-                            monthlyOccurrences = new[] {
-                    new {
-                        additionalProperties = new {
-                            key = new {},
-                        },
-                        day = "Sunday",
-                        occurrence = 1234,
-                    }
-                },
+                            ["minutes"] = new List<object>()
+{
+1234
+},
+                            ["hours"] = new List<object>()
+{
+1234
+},
+                            ["weekDays"] = new List<object>()
+{
+"Sunday"
+},
+                            ["monthDays"] = new List<object>()
+{
+1234
+},
+                            ["monthlyOccurrences"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["additionalProperties"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["day"] = "Sunday",
+["occurrence"] = 1234,
+}
+},
                         },
-                        timeZone = "<timeZone>",
+                        ["timeZone"] = "<timeZone>",
                     },
-                    recurrenceInterval = "<recurrenceInterval>",
-                    scanLevel = "Full",
-                    incrementalScanStartTime = "2022-05-10T18:57:31.2311892Z",
+                    ["recurrenceInterval"] = "<recurrenceInterval>",
+                    ["scanLevel"] = "Full",
+                    ["incrementalScanStartTime"] = "2022-05-10T18:57:31.2311892Z",
                 },
-            };
-
-            Response response = client.CreateOrUpdateTrigger(RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateTrigger(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("frequency").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("interval").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("minutes")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("hours")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("weekDays")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthDays")[0].ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("day").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("occurrence").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("timeZone").ToString());
@@ -2061,13 +1068,12 @@ public void Example_CreateOrUpdateTrigger_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateTrigger_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.CreateOrUpdateTriggerAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateTriggerAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2077,69 +1083,75 @@ public async Task Example_CreateOrUpdateTrigger_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateTrigger_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    recurrence = new
+                    ["recurrence"] = new Dictionary<string, object>()
                     {
-                        frequency = "Week",
-                        interval = 1234,
-                        startTime = "2022-05-10T18:57:31.2311892Z",
-                        endTime = "2022-05-10T18:57:31.2311892Z",
-                        schedule = new
+                        ["frequency"] = "Week",
+                        ["interval"] = 1234,
+                        ["startTime"] = "2022-05-10T18:57:31.2311892Z",
+                        ["endTime"] = "2022-05-10T18:57:31.2311892Z",
+                        ["schedule"] = new Dictionary<string, object>()
                         {
-                            additionalProperties = new
+                            ["additionalProperties"] = new Dictionary<string, object>()
                             {
-                                key = new { },
+                                ["key"] = new Dictionary<string, object>(),
                             },
-                            minutes = new[] {
-                    1234
-                },
-                            hours = new[] {
-                    1234
-                },
-                            weekDays = new[] {
-                    "Sunday"
-                },
-                            monthDays = new[] {
-                    1234
-                },
-                            monthlyOccurrences = new[] {
-                    new {
-                        additionalProperties = new {
-                            key = new {},
-                        },
-                        day = "Sunday",
-                        occurrence = 1234,
-                    }
-                },
+                            ["minutes"] = new List<object>()
+{
+1234
+},
+                            ["hours"] = new List<object>()
+{
+1234
+},
+                            ["weekDays"] = new List<object>()
+{
+"Sunday"
+},
+                            ["monthDays"] = new List<object>()
+{
+1234
+},
+                            ["monthlyOccurrences"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["additionalProperties"] = new Dictionary<string, object>()
+{
+["key"] = new Dictionary<string, object>(),
+},
+["day"] = "Sunday",
+["occurrence"] = 1234,
+}
+},
                         },
-                        timeZone = "<timeZone>",
+                        ["timeZone"] = "<timeZone>",
                     },
-                    recurrenceInterval = "<recurrenceInterval>",
-                    scanLevel = "Full",
-                    incrementalScanStartTime = "2022-05-10T18:57:31.2311892Z",
+                    ["recurrenceInterval"] = "<recurrenceInterval>",
+                    ["scanLevel"] = "Full",
+                    ["incrementalScanStartTime"] = "2022-05-10T18:57:31.2311892Z",
                 },
-            };
-
-            Response response = await client.CreateOrUpdateTriggerAsync(RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateTriggerAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("frequency").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("interval").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("minutes")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("hours")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("weekDays")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthDays")[0].ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("day").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("occurrence").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("timeZone").ToString());
@@ -2157,11 +1169,11 @@ public async Task Example_CreateOrUpdateTrigger_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTrigger()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.DeleteTrigger(new RequestContext());
+            Response response = client.DeleteTrigger(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2171,23 +1183,23 @@ public void Example_DeleteTrigger()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteTrigger_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = client.DeleteTrigger(new RequestContext());
+            Response response = client.DeleteTrigger(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("frequency").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("interval").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("minutes")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("hours")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("weekDays")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthDays")[0].ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("day").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("occurrence").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("timeZone").ToString());
@@ -2205,11 +1217,11 @@ public void Example_DeleteTrigger_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTrigger_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.DeleteTriggerAsync(new RequestContext());
+            Response response = await client.DeleteTriggerAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -2219,23 +1231,23 @@ public async Task Example_DeleteTrigger_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteTrigger_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            Response response = await client.DeleteTriggerAsync(new RequestContext());
+            Response response = await client.DeleteTriggerAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("frequency").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("interval").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("startTime").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("endTime").ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("additionalProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("minutes")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("hours")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("weekDays")[0].ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthDays")[0].ToString());
-            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("additionalProperties").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("day").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("schedule").GetProperty("monthlyOccurrences")[0].GetProperty("occurrence").ToString());
             Console.WriteLine(result.GetProperty("properties").GetProperty("recurrence").GetProperty("timeZone").ToString());
@@ -2253,14 +1265,14 @@ public async Task Example_DeleteTrigger_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRuns()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            foreach (var item in client.GetRuns(new RequestContext()))
+            foreach (BinaryData item in client.GetRuns(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -2268,38 +1280,38 @@ public void Example_GetRuns()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRuns_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            foreach (var item in client.GetRuns(new RequestContext()))
+            foreach (BinaryData item in client.GetRuns(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("resourceId").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("assetsDiscovered").ToString());
-                Console.WriteLine(result.GetProperty("assetsClassified").ToString());
-                Console.WriteLine(result.GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("queuedTime").ToString());
-                Console.WriteLine(result.GetProperty("pipelineStartTime").ToString());
-                Console.WriteLine(result.GetProperty("endTime").ToString());
-                Console.WriteLine(result.GetProperty("scanRulesetVersion").ToString());
-                Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-                Console.WriteLine(result.GetProperty("scanLevelType").ToString());
-                Console.WriteLine(result.GetProperty("errorMessage").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("runType").ToString());
-                Console.WriteLine(result.GetProperty("dataSourceType").ToString());
+                Console.WriteLine(result[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("assetsDiscovered").ToString());
+                Console.WriteLine(result[0].GetProperty("assetsClassified").ToString());
+                Console.WriteLine(result[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("queuedTime").ToString());
+                Console.WriteLine(result[0].GetProperty("pipelineStartTime").ToString());
+                Console.WriteLine(result[0].GetProperty("endTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scanRulesetVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+                Console.WriteLine(result[0].GetProperty("scanLevelType").ToString());
+                Console.WriteLine(result[0].GetProperty("errorMessage").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("runType").ToString());
+                Console.WriteLine(result[0].GetProperty("dataSourceType").ToString());
             }
         }
 
@@ -2307,14 +1319,14 @@ public void Example_GetRuns_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRuns_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            await foreach (var item in client.GetRunsAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetRunsAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -2322,38 +1334,38 @@ public async Task Example_GetRuns_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRuns_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanClient(endpoint, "<dataSourceName>", "<scanName>", credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanClient client = new PurviewScanClient(endpoint, "<DataSourceName>", "<ScanName>", credential);
 
-            await foreach (var item in client.GetRunsAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetRunsAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("resourceId").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("assetsDiscovered").ToString());
-                Console.WriteLine(result.GetProperty("assetsClassified").ToString());
-                Console.WriteLine(result.GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("queuedTime").ToString());
-                Console.WriteLine(result.GetProperty("pipelineStartTime").ToString());
-                Console.WriteLine(result.GetProperty("endTime").ToString());
-                Console.WriteLine(result.GetProperty("scanRulesetVersion").ToString());
-                Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-                Console.WriteLine(result.GetProperty("scanLevelType").ToString());
-                Console.WriteLine(result.GetProperty("errorMessage").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("runType").ToString());
-                Console.WriteLine(result.GetProperty("dataSourceType").ToString());
+                Console.WriteLine(result[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("resourceId").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("assetsDiscovered").ToString());
+                Console.WriteLine(result[0].GetProperty("assetsClassified").ToString());
+                Console.WriteLine(result[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("queuedTime").ToString());
+                Console.WriteLine(result[0].GetProperty("pipelineStartTime").ToString());
+                Console.WriteLine(result[0].GetProperty("endTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scanRulesetVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+                Console.WriteLine(result[0].GetProperty("scanLevelType").ToString());
+                Console.WriteLine(result[0].GetProperty("errorMessage").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("runType").ToString());
+                Console.WriteLine(result[0].GetProperty("dataSourceType").ToString());
             }
         }
     }
diff --git a/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewScanningServiceClient.cs b/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewScanningServiceClient.cs
index ae33ec38e88e..646b4e452f74 100644
--- a/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewScanningServiceClient.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Scanning/tests/Generated/Samples/Samples_PurviewScanningServiceClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Scanning;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +23,11 @@ public class Samples_PurviewScanningServiceClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetKeyVaultReference()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = client.GetKeyVaultReference("<keyVaultName>", new RequestContext());
+            Response response = client.GetKeyVaultReference("<keyVaultName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -37,11 +37,11 @@ public void Example_GetKeyVaultReference()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetKeyVaultReference_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = client.GetKeyVaultReference("<keyVaultName>", new RequestContext());
+            Response response = client.GetKeyVaultReference("<keyVaultName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
@@ -54,11 +54,11 @@ public void Example_GetKeyVaultReference_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetKeyVaultReference_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.GetKeyVaultReferenceAsync("<keyVaultName>", new RequestContext());
+            Response response = await client.GetKeyVaultReferenceAsync("<keyVaultName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -68,11 +68,11 @@ public async Task Example_GetKeyVaultReference_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetKeyVaultReference_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.GetKeyVaultReferenceAsync("<keyVaultName>", new RequestContext());
+            Response response = await client.GetKeyVaultReferenceAsync("<keyVaultName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
@@ -85,13 +85,12 @@ public async Task Example_GetKeyVaultReference_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateKeyVaultReference()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = client.CreateOrUpdateKeyVaultReference("<keyVaultName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CreateOrUpdateKeyVaultReference("<keyVaultName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -101,20 +100,19 @@ public void Example_CreateOrUpdateKeyVaultReference()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateKeyVaultReference_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    baseUrl = "<baseUrl>",
-                    description = "<description>",
+                    ["baseUrl"] = "<baseUrl>",
+                    ["description"] = "<description>",
                 },
-            };
-
-            Response response = client.CreateOrUpdateKeyVaultReference("<keyVaultName>", RequestContent.Create(data));
+            });
+            Response response = client.CreateOrUpdateKeyVaultReference("<keyVaultName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
@@ -127,13 +125,12 @@ public void Example_CreateOrUpdateKeyVaultReference_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateKeyVaultReference_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = await client.CreateOrUpdateKeyVaultReferenceAsync("<keyVaultName>", RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CreateOrUpdateKeyVaultReferenceAsync("<keyVaultName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -143,20 +140,19 @@ public async Task Example_CreateOrUpdateKeyVaultReference_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateKeyVaultReference_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    baseUrl = "<baseUrl>",
-                    description = "<description>",
+                    ["baseUrl"] = "<baseUrl>",
+                    ["description"] = "<description>",
                 },
-            };
-
-            Response response = await client.CreateOrUpdateKeyVaultReferenceAsync("<keyVaultName>", RequestContent.Create(data));
+            });
+            Response response = await client.CreateOrUpdateKeyVaultReferenceAsync("<keyVaultName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
@@ -169,11 +165,11 @@ public async Task Example_CreateOrUpdateKeyVaultReference_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteKeyVaultReference()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = client.DeleteKeyVaultReference("<keyVaultName>", new RequestContext());
+            Response response = client.DeleteKeyVaultReference("<keyVaultName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -183,11 +179,11 @@ public void Example_DeleteKeyVaultReference()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteKeyVaultReference_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = client.DeleteKeyVaultReference("<keyVaultName>", new RequestContext());
+            Response response = client.DeleteKeyVaultReference("<keyVaultName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
@@ -200,11 +196,11 @@ public void Example_DeleteKeyVaultReference_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteKeyVaultReference_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.DeleteKeyVaultReferenceAsync("<keyVaultName>", new RequestContext());
+            Response response = await client.DeleteKeyVaultReferenceAsync("<keyVaultName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -214,11 +210,11 @@ public async Task Example_DeleteKeyVaultReference_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteKeyVaultReference_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.DeleteKeyVaultReferenceAsync("<keyVaultName>", new RequestContext());
+            Response response = await client.DeleteKeyVaultReferenceAsync("<keyVaultName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
@@ -231,11 +227,11 @@ public async Task Example_DeleteKeyVaultReference_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetScanRuleset()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = client.GetScanRuleset("<scanRulesetName>", new RequestContext());
+            Response response = client.GetScanRuleset("<scanRulesetName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -246,11 +242,11 @@ public void Example_GetScanRuleset()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetScanRuleset_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = client.GetScanRuleset("<scanRulesetName>", new RequestContext());
+            Response response = client.GetScanRuleset("<scanRulesetName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -265,11 +261,11 @@ public void Example_GetScanRuleset_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetScanRuleset_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.GetScanRulesetAsync("<scanRulesetName>", new RequestContext());
+            Response response = await client.GetScanRulesetAsync("<scanRulesetName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -280,11 +276,11 @@ public async Task Example_GetScanRuleset_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetScanRuleset_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.GetScanRulesetAsync("<scanRulesetName>", new RequestContext());
+            Response response = await client.GetScanRulesetAsync("<scanRulesetName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -299,16 +295,12 @@ public async Task Example_GetScanRuleset_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateScanRuleset()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            var data = new
-            {
-                kind = "AzureSubscription",
-            };
-
-            Response response = client.CreateOrUpdateScanRuleset("<scanRulesetName>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = client.CreateOrUpdateScanRuleset("<scanRulesetName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -319,27 +311,28 @@ public void Example_CreateOrUpdateScanRuleset()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrUpdateScanRuleset_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    description = "<description>",
-                    excludedSystemClassifications = new[] {
-            "<String>"
-        },
-                    includedCustomClassificationRuleNames = new[] {
-            "<String>"
-        },
+                    ["description"] = "<description>",
+                    ["excludedSystemClassifications"] = new List<object>()
+{
+"<excludedSystemClassifications>"
+},
+                    ["includedCustomClassificationRuleNames"] = new List<object>()
+{
+"<includedCustomClassificationRuleNames>"
+},
                 },
-                kind = "AzureSubscription",
-                scanRulesetType = "Custom",
-            };
-
-            Response response = client.CreateOrUpdateScanRuleset("<scanRulesetName>", RequestContent.Create(data));
+                ["kind"] = "AzureSubscription",
+                ["scanRulesetType"] = "Custom",
+            });
+            Response response = client.CreateOrUpdateScanRuleset("<scanRulesetName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -354,16 +347,12 @@ public void Example_CreateOrUpdateScanRuleset_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateScanRuleset_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
-
-            var data = new
-            {
-                kind = "AzureSubscription",
-            };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.CreateOrUpdateScanRulesetAsync("<scanRulesetName>", RequestContent.Create(data));
+            RequestContent content = null;
+            Response response = await client.CreateOrUpdateScanRulesetAsync("<scanRulesetName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -374,27 +363,28 @@ public async Task Example_CreateOrUpdateScanRuleset_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrUpdateScanRuleset_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    description = "<description>",
-                    excludedSystemClassifications = new[] {
-            "<String>"
-        },
-                    includedCustomClassificationRuleNames = new[] {
-            "<String>"
-        },
+                    ["description"] = "<description>",
+                    ["excludedSystemClassifications"] = new List<object>()
+{
+"<excludedSystemClassifications>"
+},
+                    ["includedCustomClassificationRuleNames"] = new List<object>()
+{
+"<includedCustomClassificationRuleNames>"
+},
                 },
-                kind = "AzureSubscription",
-                scanRulesetType = "Custom",
-            };
-
-            Response response = await client.CreateOrUpdateScanRulesetAsync("<scanRulesetName>", RequestContent.Create(data));
+                ["kind"] = "AzureSubscription",
+                ["scanRulesetType"] = "Custom",
+            });
+            Response response = await client.CreateOrUpdateScanRulesetAsync("<scanRulesetName>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -409,11 +399,11 @@ public async Task Example_CreateOrUpdateScanRuleset_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteScanRuleset()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = client.DeleteScanRuleset("<scanRulesetName>", new RequestContext());
+            Response response = client.DeleteScanRuleset("<scanRulesetName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -424,11 +414,11 @@ public void Example_DeleteScanRuleset()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteScanRuleset_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = client.DeleteScanRuleset("<scanRulesetName>", new RequestContext());
+            Response response = client.DeleteScanRuleset("<scanRulesetName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -443,11 +433,11 @@ public void Example_DeleteScanRuleset_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteScanRuleset_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.DeleteScanRulesetAsync("<scanRulesetName>", new RequestContext());
+            Response response = await client.DeleteScanRulesetAsync("<scanRulesetName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -458,11 +448,11 @@ public async Task Example_DeleteScanRuleset_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteScanRuleset_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.DeleteScanRulesetAsync("<scanRulesetName>", new RequestContext());
+            Response response = await client.DeleteScanRulesetAsync("<scanRulesetName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -477,11 +467,11 @@ public async Task Example_DeleteScanRuleset_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSystemRulesetsForDataSource()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = client.GetSystemRulesetsForDataSource("<dataSourceType>", new RequestContext());
+            Response response = client.GetSystemRulesetsForDataSource("None", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -492,11 +482,11 @@ public void Example_GetSystemRulesetsForDataSource()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSystemRulesetsForDataSource_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = client.GetSystemRulesetsForDataSource("<dataSourceType>", new RequestContext());
+            Response response = client.GetSystemRulesetsForDataSource("None", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -511,11 +501,11 @@ public void Example_GetSystemRulesetsForDataSource_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSystemRulesetsForDataSource_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.GetSystemRulesetsForDataSourceAsync("<dataSourceType>", new RequestContext());
+            Response response = await client.GetSystemRulesetsForDataSourceAsync("None", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -526,11 +516,11 @@ public async Task Example_GetSystemRulesetsForDataSource_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSystemRulesetsForDataSource_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.GetSystemRulesetsForDataSourceAsync("<dataSourceType>", new RequestContext());
+            Response response = await client.GetSystemRulesetsForDataSourceAsync("None", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -545,11 +535,11 @@ public async Task Example_GetSystemRulesetsForDataSource_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSystemRulesetsForVersion()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = client.GetSystemRulesetsForVersion(1234, "<dataSourceType>", new RequestContext());
+            Response response = client.GetSystemRulesetsForVersion(1234, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -560,11 +550,11 @@ public void Example_GetSystemRulesetsForVersion()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSystemRulesetsForVersion_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = client.GetSystemRulesetsForVersion(1234, "<dataSourceType>", new RequestContext());
+            Response response = client.GetSystemRulesetsForVersion(1234, "None", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -579,11 +569,11 @@ public void Example_GetSystemRulesetsForVersion_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSystemRulesetsForVersion_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.GetSystemRulesetsForVersionAsync(1234, "<dataSourceType>", new RequestContext());
+            Response response = await client.GetSystemRulesetsForVersionAsync(1234, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -594,11 +584,11 @@ public async Task Example_GetSystemRulesetsForVersion_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSystemRulesetsForVersion_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.GetSystemRulesetsForVersionAsync(1234, "<dataSourceType>", new RequestContext());
+            Response response = await client.GetSystemRulesetsForVersionAsync(1234, "None", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -613,11 +603,11 @@ public async Task Example_GetSystemRulesetsForVersion_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLatestSystemRulesets()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = client.GetLatestSystemRulesets("<dataSourceType>", new RequestContext());
+            Response response = client.GetLatestSystemRulesets(null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -628,11 +618,11 @@ public void Example_GetLatestSystemRulesets()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetLatestSystemRulesets_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = client.GetLatestSystemRulesets("<dataSourceType>", new RequestContext());
+            Response response = client.GetLatestSystemRulesets("None", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -647,11 +637,11 @@ public void Example_GetLatestSystemRulesets_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLatestSystemRulesets_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.GetLatestSystemRulesetsAsync("<dataSourceType>", new RequestContext());
+            Response response = await client.GetLatestSystemRulesetsAsync(null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -662,11 +652,11 @@ public async Task Example_GetLatestSystemRulesets_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetLatestSystemRulesets_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            Response response = await client.GetLatestSystemRulesetsAsync("<dataSourceType>", new RequestContext());
+            Response response = await client.GetLatestSystemRulesetsAsync("None", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("kind").ToString());
@@ -681,14 +671,14 @@ public async Task Example_GetLatestSystemRulesets_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetKeyVaultReferences()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetKeyVaultReferences(new RequestContext()))
+            foreach (BinaryData item in client.GetKeyVaultReferences(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -696,17 +686,17 @@ public void Example_GetKeyVaultReferences()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetKeyVaultReferences_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetKeyVaultReferences(new RequestContext()))
+            foreach (BinaryData item in client.GetKeyVaultReferences(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("baseUrl").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -714,14 +704,14 @@ public void Example_GetKeyVaultReferences_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetKeyVaultReferences_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetKeyVaultReferencesAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetKeyVaultReferencesAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -729,17 +719,17 @@ public async Task Example_GetKeyVaultReferences_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetKeyVaultReferences_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetKeyVaultReferencesAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetKeyVaultReferencesAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("properties").GetProperty("baseUrl").ToString());
-                Console.WriteLine(result.GetProperty("properties").GetProperty("description").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("baseUrl").ToString());
+                Console.WriteLine(result[0].GetProperty("properties").GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -747,15 +737,15 @@ public async Task Example_GetKeyVaultReferences_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetClassificationRules()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetClassificationRules(new RequestContext()))
+            foreach (BinaryData item in client.GetClassificationRules(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -763,16 +753,16 @@ public void Example_GetClassificationRules()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetClassificationRules_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetClassificationRules(new RequestContext()))
+            foreach (BinaryData item in client.GetClassificationRules(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -780,15 +770,15 @@ public void Example_GetClassificationRules_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetClassificationRules_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetClassificationRulesAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetClassificationRulesAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -796,16 +786,16 @@ public async Task Example_GetClassificationRules_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetClassificationRules_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetClassificationRulesAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetClassificationRulesAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -813,15 +803,15 @@ public async Task Example_GetClassificationRules_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDataSources()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetDataSources(new RequestContext()))
+            foreach (BinaryData item in client.GetDataSources(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -829,44 +819,44 @@ public void Example_GetDataSources()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetDataSources_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetDataSources(new RequestContext()))
+            foreach (BinaryData item in client.GetDataSources(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("endTime").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("runType").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("endTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("runType").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -874,15 +864,15 @@ public void Example_GetDataSources_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDataSources_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetDataSourcesAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetDataSourcesAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -890,44 +880,44 @@ public async Task Example_GetDataSources_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetDataSources_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetDataSourcesAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetDataSourcesAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("parentId").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<test>").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("endTime").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("runType").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("scans")[0].GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("parentId").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("resourceId").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsDiscovered").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("assetsClassified").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("notifications")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("diagnostics").GetProperty("exceptionCountMap").GetProperty("<key>").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("queuedTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("pipelineStartTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("endTime").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetVersion").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanRulesetType").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("scanLevelType").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("errorMessage").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("code").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("message").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("error").GetProperty("details")[0].GetProperty("target").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("runType").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("scanResults")[0].GetProperty("dataSourceType").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("scans")[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -935,15 +925,15 @@ public async Task Example_GetDataSources_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetScanRulesets()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetScanRulesets(new RequestContext()))
+            foreach (BinaryData item in client.GetScanRulesets(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -951,19 +941,19 @@ public void Example_GetScanRulesets()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetScanRulesets_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetScanRulesets(new RequestContext()))
+            foreach (BinaryData item in client.GetScanRulesets(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -971,15 +961,15 @@ public void Example_GetScanRulesets_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetScanRulesets_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetScanRulesetsAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetScanRulesetsAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -987,19 +977,19 @@ public async Task Example_GetScanRulesets_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetScanRulesets_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetScanRulesetsAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetScanRulesetsAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -1007,15 +997,15 @@ public async Task Example_GetScanRulesets_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSystemRulesets()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetSystemRulesets(new RequestContext()))
+            foreach (BinaryData item in client.GetSystemRulesets(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1023,19 +1013,19 @@ public void Example_GetSystemRulesets()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSystemRulesets_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetSystemRulesets(new RequestContext()))
+            foreach (BinaryData item in client.GetSystemRulesets(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -1043,15 +1033,15 @@ public void Example_GetSystemRulesets_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSystemRulesets_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetSystemRulesetsAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetSystemRulesetsAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1059,19 +1049,19 @@ public async Task Example_GetSystemRulesets_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSystemRulesets_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetSystemRulesetsAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetSystemRulesetsAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -1079,15 +1069,15 @@ public async Task Example_GetSystemRulesets_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSystemRulesetsVersions()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetSystemRulesetsVersions("<dataSourceType>", new RequestContext()))
+            foreach (BinaryData item in client.GetSystemRulesetsVersions(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1095,19 +1085,19 @@ public void Example_GetSystemRulesetsVersions()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSystemRulesetsVersions_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetSystemRulesetsVersions("<dataSourceType>", new RequestContext()))
+            foreach (BinaryData item in client.GetSystemRulesetsVersions("None", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
 
@@ -1115,15 +1105,15 @@ public void Example_GetSystemRulesetsVersions_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSystemRulesetsVersions_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetSystemRulesetsVersionsAsync("<dataSourceType>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSystemRulesetsVersionsAsync(null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -1131,19 +1121,19 @@ public async Task Example_GetSystemRulesetsVersions_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSystemRulesetsVersions_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewScanningServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewScanningServiceClient client = new PurviewScanningServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetSystemRulesetsVersionsAsync("<dataSourceType>", new RequestContext()))
+            await foreach (BinaryData item in client.GetSystemRulesetsVersionsAsync("None", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("kind").ToString());
-                Console.WriteLine(result.GetProperty("scanRulesetType").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("version").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("kind").ToString());
+                Console.WriteLine(result[0].GetProperty("scanRulesetType").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("version").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
             }
         }
     }
diff --git a/sdk/purview/Azure.Analytics.Purview.Sharing/src/Generated/Docs/ReceivedSharesClient.xml b/sdk/purview/Azure.Analytics.Purview.Sharing/src/Generated/Docs/ReceivedSharesClient.xml
index 06c28769105d..75485f2e0593 100644
--- a/sdk/purview/Azure.Analytics.Purview.Sharing/src/Generated/Docs/ReceivedSharesClient.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Sharing/src/Generated/Docs/ReceivedSharesClient.xml
@@ -2,67 +2,89 @@
 <doc>
   <members>
     <member name="GetReceivedShareAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetReceivedShareAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetReceivedShareAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-Response response = await client.GetReceivedShareAsync("<receivedShareId>", new RequestContext());
+Response response = await client.GetReceivedShareAsync("<receivedShareId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("shareKind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetReceivedShareAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
+
+Response response = await client.GetReceivedShareAsync("<receivedShareId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("shareKind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetReceivedShare(string,RequestContext)">
-<example>
-This sample shows how to call GetReceivedShare with required parameters and parse the result.
+      <example>
+This sample shows how to call GetReceivedShare and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
+
+Response response = client.GetReceivedShare("<receivedShareId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("shareKind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetReceivedShare with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-Response response = client.GetReceivedShare("<receivedShareId>", new RequestContext());
+Response response = client.GetReceivedShare("<receivedShareId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("shareKind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="ActivateTenantEmailRegistrationAsync(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call ActivateTenantEmailRegistrationAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-Response response = await client.ActivateTenantEmailRegistrationAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.ActivateTenantEmailRegistrationAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call ActivateTenantEmailRegistrationAsync with all request content, and how to parse the result.
+This sample shows how to call ActivateTenantEmailRegistrationAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-var data = new {
-    properties = new {
-        activationCode = "<activationCode>",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["activationCode"] = "<activationCode>",
     },
-};
-
-Response response = await client.ActivateTenantEmailRegistrationAsync(RequestContent.Create(data));
+});
+Response response = await client.ActivateTenantEmailRegistrationAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("activationCode").ToString());
@@ -73,37 +95,36 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("state").ToString
 Console.WriteLine(result.GetProperty("properties").GetProperty("tenantId").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="ActivateTenantEmailRegistration(RequestContent,RequestContext)">
-<example>
+      <example>
 This sample shows how to call ActivateTenantEmailRegistration and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-Response response = client.ActivateTenantEmailRegistration(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.ActivateTenantEmailRegistration(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call ActivateTenantEmailRegistration with all request content, and how to parse the result.
+This sample shows how to call ActivateTenantEmailRegistration with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-var data = new {
-    properties = new {
-        activationCode = "<activationCode>",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["activationCode"] = "<activationCode>",
     },
-};
-
-Response response = client.ActivateTenantEmailRegistration(RequestContent.Create(data));
+});
+Response response = client.ActivateTenantEmailRegistration(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("activationCode").ToString());
@@ -114,18 +135,28 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("state").ToString
 Console.WriteLine(result.GetProperty("properties").GetProperty("tenantId").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RegisterTenantEmailRegistrationAsync(RequestContext)">
-<example>
-This sample shows how to call RegisterTenantEmailRegistrationAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call RegisterTenantEmailRegistrationAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-Response response = await client.RegisterTenantEmailRegistrationAsync(new RequestContext());
+Response response = await client.RegisterTenantEmailRegistrationAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call RegisterTenantEmailRegistrationAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
+
+Response response = await client.RegisterTenantEmailRegistrationAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("activationCode").ToString());
@@ -136,18 +167,28 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("state").ToString
 Console.WriteLine(result.GetProperty("properties").GetProperty("tenantId").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RegisterTenantEmailRegistration(RequestContext)">
-<example>
-This sample shows how to call RegisterTenantEmailRegistration with required parameters and parse the result.
+      <example>
+This sample shows how to call RegisterTenantEmailRegistration and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-Response response = client.RegisterTenantEmailRegistration(new RequestContext());
+Response response = client.RegisterTenantEmailRegistration(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call RegisterTenantEmailRegistration with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
+
+Response response = client.RegisterTenantEmailRegistration(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("properties").GetProperty("activationCode").ToString());
@@ -158,206 +199,271 @@ Console.WriteLine(result.GetProperty("properties").GetProperty("state").ToString
 Console.WriteLine(result.GetProperty("properties").GetProperty("tenantId").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAllAttachedReceivedSharesAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetAllAttachedReceivedSharesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllAttachedReceivedSharesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-await foreach (var item in client.GetAllAttachedReceivedSharesAsync("<referenceName>", "<filter>", "<orderby>", new RequestContext()))
+await foreach (BinaryData item in client.GetAllAttachedReceivedSharesAsync("<referenceName>", null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("shareKind").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllAttachedReceivedSharesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetAllAttachedReceivedSharesAsync("<referenceName>", "<filter>", "<orderby>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllAttachedReceivedShares(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetAllAttachedReceivedShares with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllAttachedReceivedShares and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-foreach (var item in client.GetAllAttachedReceivedShares("<referenceName>", "<filter>", "<orderby>", new RequestContext()))
+foreach (BinaryData item in client.GetAllAttachedReceivedShares("<referenceName>", null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("shareKind").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllAttachedReceivedShares with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetAllAttachedReceivedShares("<referenceName>", "<filter>", "<orderby>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllDetachedReceivedSharesAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetAllDetachedReceivedSharesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllDetachedReceivedSharesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-await foreach (var item in client.GetAllDetachedReceivedSharesAsync("<filter>", "<orderby>", new RequestContext()))
+await foreach (BinaryData item in client.GetAllDetachedReceivedSharesAsync(null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("shareKind").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllDetachedReceivedSharesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetAllDetachedReceivedSharesAsync("<filter>", "<orderby>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllDetachedReceivedShares(string,string,RequestContext)">
-<example>
-This sample shows how to call GetAllDetachedReceivedShares with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllDetachedReceivedShares and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-foreach (var item in client.GetAllDetachedReceivedShares("<filter>", "<orderby>", new RequestContext()))
+foreach (BinaryData item in client.GetAllDetachedReceivedShares(null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("shareKind").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllDetachedReceivedShares with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetAllDetachedReceivedShares("<filter>", "<orderby>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateOrReplaceReceivedShareAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrReplaceReceivedShareAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrReplaceReceivedShareAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
-
-var data = new {
-    properties = new {},
-    shareKind = "InPlace",
-};
-
-var operation = await client.CreateOrReplaceReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>(),
+    ["shareKind"] = "InPlace",
+});
+Operation<BinaryData> operation = await client.CreateOrReplaceReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("shareKind").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrReplaceReceivedShareAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrReplaceReceivedShareAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
-
-var data = new {
-    properties = new {
-        assetStoreKind = "AdlsGen2Account",
-        displayName = "<displayName>",
-        shareStatus = "Detached",
-        sink = new {
-            properties = new {
-                containerName = "<containerName>",
-                folder = "<folder>",
-                mountPath = "<mountPath>",
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["assetStoreKind"] = "AdlsGen2Account",
+        ["displayName"] = "<displayName>",
+        ["shareStatus"] = "Detached",
+        ["sink"] = new Dictionary<string, object>()
+        {
+            ["properties"] = new Dictionary<string, object>()
+            {
+                ["containerName"] = "<containerName>",
+                ["folder"] = "<folder>",
+                ["mountPath"] = "<mountPath>",
             },
-            storeKind = "AdlsGen2Account",
-            storeReference = new {
-                referenceName = "<referenceName>",
-                type = "ArmResourceReference",
+            ["storeKind"] = "AdlsGen2Account",
+            ["storeReference"] = new Dictionary<string, object>()
+            {
+                ["referenceName"] = "<referenceName>",
+                ["type"] = "ArmResourceReference",
             },
         },
     },
-    shareKind = "InPlace",
-};
-
-var operation = await client.CreateOrReplaceReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", RequestContent.Create(data));
-
+    ["shareKind"] = "InPlace",
+});
+Operation<BinaryData> operation = await client.CreateOrReplaceReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("shareKind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrReplaceReceivedShare(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrReplaceReceivedShare with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateOrReplaceReceivedShare and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
-
-var data = new {
-    properties = new {},
-    shareKind = "InPlace",
-};
-
-var operation = client.CreateOrReplaceReceivedShare(WaitUntil.Completed, "<receivedShareId>", RequestContent.Create(data));
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>(),
+    ["shareKind"] = "InPlace",
+});
+Operation<BinaryData> operation = client.CreateOrReplaceReceivedShare(WaitUntil.Completed, "<receivedShareId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("shareKind").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrReplaceReceivedShare with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateOrReplaceReceivedShare with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
-
-var data = new {
-    properties = new {
-        assetStoreKind = "AdlsGen2Account",
-        displayName = "<displayName>",
-        shareStatus = "Detached",
-        sink = new {
-            properties = new {
-                containerName = "<containerName>",
-                folder = "<folder>",
-                mountPath = "<mountPath>",
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["assetStoreKind"] = "AdlsGen2Account",
+        ["displayName"] = "<displayName>",
+        ["shareStatus"] = "Detached",
+        ["sink"] = new Dictionary<string, object>()
+        {
+            ["properties"] = new Dictionary<string, object>()
+            {
+                ["containerName"] = "<containerName>",
+                ["folder"] = "<folder>",
+                ["mountPath"] = "<mountPath>",
             },
-            storeKind = "AdlsGen2Account",
-            storeReference = new {
-                referenceName = "<referenceName>",
-                type = "ArmResourceReference",
+            ["storeKind"] = "AdlsGen2Account",
+            ["storeReference"] = new Dictionary<string, object>()
+            {
+                ["referenceName"] = "<referenceName>",
+                ["type"] = "ArmResourceReference",
             },
         },
     },
-    shareKind = "InPlace",
-};
-
-var operation = client.CreateOrReplaceReceivedShare(WaitUntil.Completed, "<receivedShareId>", RequestContent.Create(data));
-
+    ["shareKind"] = "InPlace",
+});
+Operation<BinaryData> operation = client.CreateOrReplaceReceivedShare(WaitUntil.Completed, "<receivedShareId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("shareKind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteReceivedShareAsync(WaitUntil,string,RequestContext)">
-<example>
-This sample shows how to call DeleteReceivedShareAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteReceivedShareAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-var operation = await client.DeleteReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", new RequestContext());
+Operation<BinaryData> operation = await client.DeleteReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call DeleteReceivedShareAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
+
+Operation<BinaryData> operation = await client.DeleteReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("endTime").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
@@ -366,20 +472,31 @@ Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteReceivedShare(WaitUntil,string,RequestContext)">
-<example>
-This sample shows how to call DeleteReceivedShare with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteReceivedShare and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ReceivedSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-var operation = client.DeleteReceivedShare(WaitUntil.Completed, "<receivedShareId>", new RequestContext());
+Operation<BinaryData> operation = client.DeleteReceivedShare(WaitUntil.Completed, "<receivedShareId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call DeleteReceivedShare with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
+
+Operation<BinaryData> operation = client.DeleteReceivedShare(WaitUntil.Completed, "<receivedShareId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("endTime").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
@@ -388,8 +505,7 @@ Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Sharing/src/Generated/Docs/SentSharesClient.xml b/sdk/purview/Azure.Analytics.Purview.Sharing/src/Generated/Docs/SentSharesClient.xml
index 59711bb32641..445adcd72723 100644
--- a/sdk/purview/Azure.Analytics.Purview.Sharing/src/Generated/Docs/SentSharesClient.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Sharing/src/Generated/Docs/SentSharesClient.xml
@@ -2,430 +2,578 @@
 <doc>
   <members>
     <member name="GetSentShareAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetSentShareAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSentShareAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-Response response = await client.GetSentShareAsync("<sentShareId>", new RequestContext());
+Response response = await client.GetSentShareAsync("<sentShareId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("shareKind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSentShareAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+Response response = await client.GetSentShareAsync("<sentShareId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("shareKind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetSentShare(string,RequestContext)">
-<example>
-This sample shows how to call GetSentShare with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSentShare and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-Response response = client.GetSentShare("<sentShareId>", new RequestContext());
+Response response = client.GetSentShare("<sentShareId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("shareKind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSentShare with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+Response response = client.GetSentShare("<sentShareId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("shareKind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetSentShareInvitationAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetSentShareInvitationAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSentShareInvitationAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+Response response = await client.GetSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("invitationKind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSentShareInvitationAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-Response response = await client.GetSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+Response response = await client.GetSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("invitationKind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetSentShareInvitation(string,string,RequestContext)">
-<example>
-This sample shows how to call GetSentShareInvitation with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSentShareInvitation and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-Response response = client.GetSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+Response response = client.GetSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("invitationKind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSentShareInvitation with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+Response response = client.GetSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("invitationKind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateSentShareInvitationAsync(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateSentShareInvitationAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateSentShareInvitationAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-var data = new {
-    properties = new {
-        targetActiveDirectoryId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-        targetObjectId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["targetActiveDirectoryId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+        ["targetObjectId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
     },
-    invitationKind = "Service",
-};
-
-Response response = await client.CreateSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", RequestContent.Create(data));
+    ["invitationKind"] = "Service",
+});
+Response response = await client.CreateSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("invitationKind").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateSentShareInvitationAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
-
-var data = new {
-    properties = new {
-        expirationDate = "2022-05-10T18:57:31.2311892Z",
-        shareStatus = "Detached",
-        targetActiveDirectoryId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-        targetObjectId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-    },
-    invitationKind = "Service",
-};
+This sample shows how to call CreateSentShareInvitationAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-Response response = await client.CreateSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["expirationDate"] = "2022-05-10T18:57:31.2311892Z",
+        ["shareStatus"] = "Detached",
+        ["targetActiveDirectoryId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+        ["targetObjectId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+    },
+    ["invitationKind"] = "Service",
+});
+Response response = await client.CreateSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("invitationKind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateSentShareInvitation(string,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateSentShareInvitation with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateSentShareInvitation and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-var data = new {
-    properties = new {
-        targetActiveDirectoryId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-        targetObjectId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["targetActiveDirectoryId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+        ["targetObjectId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
     },
-    invitationKind = "Service",
-};
-
-Response response = client.CreateSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", RequestContent.Create(data));
+    ["invitationKind"] = "Service",
+});
+Response response = client.CreateSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("invitationKind").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateSentShareInvitation with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
-
-var data = new {
-    properties = new {
-        expirationDate = "2022-05-10T18:57:31.2311892Z",
-        shareStatus = "Detached",
-        targetActiveDirectoryId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-        targetObjectId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-    },
-    invitationKind = "Service",
-};
+This sample shows how to call CreateSentShareInvitation with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-Response response = client.CreateSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["expirationDate"] = "2022-05-10T18:57:31.2311892Z",
+        ["shareStatus"] = "Detached",
+        ["targetActiveDirectoryId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+        ["targetObjectId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+    },
+    ["invitationKind"] = "Service",
+});
+Response response = client.CreateSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("invitationKind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="NotifyUserSentShareInvitationAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call NotifyUserSentShareInvitationAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call NotifyUserSentShareInvitationAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-Response response = await client.NotifyUserSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+Response response = await client.NotifyUserSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("invitationKind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call NotifyUserSentShareInvitationAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+Response response = await client.NotifyUserSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("invitationKind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="NotifyUserSentShareInvitation(string,string,RequestContext)">
-<example>
-This sample shows how to call NotifyUserSentShareInvitation with required parameters and parse the result.
+      <example>
+This sample shows how to call NotifyUserSentShareInvitation and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+Response response = client.NotifyUserSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("invitationKind").ToString());
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call NotifyUserSentShareInvitation with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-Response response = client.NotifyUserSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+Response response = client.NotifyUserSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("invitationKind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetAllSentSharesAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetAllSentSharesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllSentSharesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-await foreach (var item in client.GetAllSentSharesAsync("<referenceName>", "<filter>", "<orderby>", new RequestContext()))
+await foreach (BinaryData item in client.GetAllSentSharesAsync("<referenceName>", null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("shareKind").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllSentSharesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetAllSentSharesAsync("<referenceName>", "<filter>", "<orderby>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllSentShares(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetAllSentShares with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllSentShares and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-foreach (var item in client.GetAllSentShares("<referenceName>", "<filter>", "<orderby>", new RequestContext()))
+foreach (BinaryData item in client.GetAllSentShares("<referenceName>", null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("shareKind").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllSentShares with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetAllSentShares("<referenceName>", "<filter>", "<orderby>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllSentShareInvitationsAsync(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetAllSentShareInvitationsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllSentShareInvitationsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-await foreach (var item in client.GetAllSentShareInvitationsAsync("<sentShareId>", "<filter>", "<orderby>", new RequestContext()))
+await foreach (BinaryData item in client.GetAllSentShareInvitationsAsync("<sentShareId>", null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("invitationKind").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("invitationKind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllSentShareInvitationsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetAllSentShareInvitationsAsync("<sentShareId>", "<filter>", "<orderby>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("invitationKind").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllSentShareInvitations(string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetAllSentShareInvitations with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllSentShareInvitations and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-foreach (var item in client.GetAllSentShareInvitations("<sentShareId>", "<filter>", "<orderby>", new RequestContext()))
+foreach (BinaryData item in client.GetAllSentShareInvitations("<sentShareId>", null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("invitationKind").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("invitationKind").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllSentShareInvitations with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetAllSentShareInvitations("<sentShareId>", "<filter>", "<orderby>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("invitationKind").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+}
+]]></code></example>
     </member>
     <member name="CreateOrReplaceSentShareAsync(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrReplaceSentShareAsync with required parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
-
-var data = new {
-    properties = new {
-        artifact = new {
-            properties = new {
-                paths = new[] {
-                    new {
-                        containerName = "<containerName>",
-                    }
-                },
+      <example>
+This sample shows how to call CreateOrReplaceSentShareAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["artifact"] = new Dictionary<string, object>()
+        {
+            ["properties"] = new Dictionary<string, object>()
+            {
+                ["paths"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["containerName"] = "<containerName>",
+}
+},
             },
-            storeKind = "AdlsGen2Account",
-            storeReference = new {},
+            ["storeKind"] = "AdlsGen2Account",
+            ["storeReference"] = new Dictionary<string, object>(),
         },
-        displayName = "<displayName>",
+        ["displayName"] = "<displayName>",
     },
-    shareKind = "InPlace",
-};
-
-var operation = await client.CreateOrReplaceSentShareAsync(WaitUntil.Completed, "<sentShareId>", RequestContent.Create(data));
-
+    ["shareKind"] = "InPlace",
+});
+Operation<BinaryData> operation = await client.CreateOrReplaceSentShareAsync(WaitUntil.Completed, "<sentShareId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("shareKind").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrReplaceSentShareAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
-
-var data = new {
-    properties = new {
-        artifact = new {
-            properties = new {
-                paths = new[] {
-                    new {
-                        containerName = "<containerName>",
-                        receiverPath = "<receiverPath>",
-                        senderPath = "<senderPath>",
-                    }
-                },
+This sample shows how to call CreateOrReplaceSentShareAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["artifact"] = new Dictionary<string, object>()
+        {
+            ["properties"] = new Dictionary<string, object>()
+            {
+                ["paths"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["containerName"] = "<containerName>",
+["receiverPath"] = "<receiverPath>",
+["senderPath"] = "<senderPath>",
+}
+},
             },
-            storeKind = "AdlsGen2Account",
-            storeReference = new {
-                referenceName = "<referenceName>",
-                type = "ArmResourceReference",
+            ["storeKind"] = "AdlsGen2Account",
+            ["storeReference"] = new Dictionary<string, object>()
+            {
+                ["referenceName"] = "<referenceName>",
+                ["type"] = "ArmResourceReference",
             },
         },
-        description = "<description>",
-        displayName = "<displayName>",
+        ["description"] = "<description>",
+        ["displayName"] = "<displayName>",
     },
-    shareKind = "InPlace",
-};
-
-var operation = await client.CreateOrReplaceSentShareAsync(WaitUntil.Completed, "<sentShareId>", RequestContent.Create(data));
-
+    ["shareKind"] = "InPlace",
+});
+Operation<BinaryData> operation = await client.CreateOrReplaceSentShareAsync(WaitUntil.Completed, "<sentShareId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("shareKind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrReplaceSentShare(WaitUntil,string,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrReplaceSentShare with required parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
-
-var data = new {
-    properties = new {
-        artifact = new {
-            properties = new {
-                paths = new[] {
-                    new {
-                        containerName = "<containerName>",
-                    }
-                },
+      <example>
+This sample shows how to call CreateOrReplaceSentShare and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["artifact"] = new Dictionary<string, object>()
+        {
+            ["properties"] = new Dictionary<string, object>()
+            {
+                ["paths"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["containerName"] = "<containerName>",
+}
+},
             },
-            storeKind = "AdlsGen2Account",
-            storeReference = new {},
+            ["storeKind"] = "AdlsGen2Account",
+            ["storeReference"] = new Dictionary<string, object>(),
         },
-        displayName = "<displayName>",
+        ["displayName"] = "<displayName>",
     },
-    shareKind = "InPlace",
-};
-
-var operation = client.CreateOrReplaceSentShare(WaitUntil.Completed, "<sentShareId>", RequestContent.Create(data));
-
+    ["shareKind"] = "InPlace",
+});
+Operation<BinaryData> operation = client.CreateOrReplaceSentShare(WaitUntil.Completed, "<sentShareId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("shareKind").ToString());
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateOrReplaceSentShare with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
-
-var data = new {
-    properties = new {
-        artifact = new {
-            properties = new {
-                paths = new[] {
-                    new {
-                        containerName = "<containerName>",
-                        receiverPath = "<receiverPath>",
-                        senderPath = "<senderPath>",
-                    }
-                },
+This sample shows how to call CreateOrReplaceSentShare with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["properties"] = new Dictionary<string, object>()
+    {
+        ["artifact"] = new Dictionary<string, object>()
+        {
+            ["properties"] = new Dictionary<string, object>()
+            {
+                ["paths"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["containerName"] = "<containerName>",
+["receiverPath"] = "<receiverPath>",
+["senderPath"] = "<senderPath>",
+}
+},
             },
-            storeKind = "AdlsGen2Account",
-            storeReference = new {
-                referenceName = "<referenceName>",
-                type = "ArmResourceReference",
+            ["storeKind"] = "AdlsGen2Account",
+            ["storeReference"] = new Dictionary<string, object>()
+            {
+                ["referenceName"] = "<referenceName>",
+                ["type"] = "ArmResourceReference",
             },
         },
-        description = "<description>",
-        displayName = "<displayName>",
+        ["description"] = "<description>",
+        ["displayName"] = "<displayName>",
     },
-    shareKind = "InPlace",
-};
-
-var operation = client.CreateOrReplaceSentShare(WaitUntil.Completed, "<sentShareId>", RequestContent.Create(data));
-
+    ["shareKind"] = "InPlace",
+});
+Operation<BinaryData> operation = client.CreateOrReplaceSentShare(WaitUntil.Completed, "<sentShareId>", content);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("shareKind").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("type").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteSentShareAsync(WaitUntil,string,RequestContext)">
-<example>
-This sample shows how to call DeleteSentShareAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteSentShareAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-var operation = await client.DeleteSentShareAsync(WaitUntil.Completed, "<sentShareId>", new RequestContext());
+Operation<BinaryData> operation = await client.DeleteSentShareAsync(WaitUntil.Completed, "<sentShareId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call DeleteSentShareAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+Operation<BinaryData> operation = await client.DeleteSentShareAsync(WaitUntil.Completed, "<sentShareId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("endTime").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
@@ -434,20 +582,31 @@ Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteSentShare(WaitUntil,string,RequestContext)">
-<example>
-This sample shows how to call DeleteSentShare with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteSentShare and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-var operation = client.DeleteSentShare(WaitUntil.Completed, "<sentShareId>", new RequestContext());
+Operation<BinaryData> operation = client.DeleteSentShare(WaitUntil.Completed, "<sentShareId>", null);
+BinaryData responseData = operation.Value;
+
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call DeleteSentShare with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
+Operation<BinaryData> operation = client.DeleteSentShare(WaitUntil.Completed, "<sentShareId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("endTime").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
@@ -456,20 +615,31 @@ Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteSentShareInvitationAsync(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteSentShareInvitationAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteSentShareInvitationAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+Operation<BinaryData> operation = await client.DeleteSentShareInvitationAsync(WaitUntil.Completed, "<sentShareId>", "<sentShareInvitationId>", null);
+BinaryData responseData = operation.Value;
 
-var operation = await client.DeleteSentShareInvitationAsync(WaitUntil.Completed, "<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call DeleteSentShareInvitationAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
+Operation<BinaryData> operation = await client.DeleteSentShareInvitationAsync(WaitUntil.Completed, "<sentShareId>", "<sentShareInvitationId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("endTime").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
@@ -478,20 +648,31 @@ Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteSentShareInvitation(WaitUntil,string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteSentShareInvitation with required parameters and parse the result.
+      <example>
+This sample shows how to call DeleteSentShareInvitation and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new SentSharesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-var operation = client.DeleteSentShareInvitation(WaitUntil.Completed, "<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+Operation<BinaryData> operation = client.DeleteSentShareInvitation(WaitUntil.Completed, "<sentShareId>", "<sentShareInvitationId>", null);
+BinaryData responseData = operation.Value;
 
+JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
+Console.WriteLine(result.GetProperty("status").ToString());
+]]></code>
+This sample shows how to call DeleteSentShareInvitation with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+SentSharesClient client = new SentSharesClient(endpoint, credential);
+
+Operation<BinaryData> operation = client.DeleteSentShareInvitation(WaitUntil.Completed, "<sentShareId>", "<sentShareInvitationId>", null);
 BinaryData responseData = operation.Value;
+
 JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
 Console.WriteLine(result.GetProperty("endTime").ToString());
 Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
@@ -500,8 +681,7 @@ Console.WriteLine(result.GetProperty("error").GetProperty("target").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("startTime").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Sharing/src/Generated/Docs/ShareResourcesClient.xml b/sdk/purview/Azure.Analytics.Purview.Sharing/src/Generated/Docs/ShareResourcesClient.xml
index d85acffd3cc6..75c89680ee38 100644
--- a/sdk/purview/Azure.Analytics.Purview.Sharing/src/Generated/Docs/ShareResourcesClient.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Sharing/src/Generated/Docs/ShareResourcesClient.xml
@@ -2,48 +2,70 @@
 <doc>
   <members>
     <member name="GetAllShareResourcesAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call GetAllShareResourcesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllShareResourcesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ShareResourcesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ShareResourcesClient client = new ShareResourcesClient(endpoint, credential);
 
-await foreach (var item in client.GetAllShareResourcesAsync("<filter>", "<orderby>", new RequestContext()))
+await foreach (BinaryData item in client.GetAllShareResourcesAsync(null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("receivedSharesCount").ToString());
-    Console.WriteLine(result.GetProperty("sentSharesCount").ToString());
-    Console.WriteLine(result.GetProperty("storeKind").ToString());
-    Console.WriteLine(result.GetProperty("storeReference").GetProperty("referenceName").ToString());
-    Console.WriteLine(result.GetProperty("storeReference").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllShareResourcesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ShareResourcesClient client = new ShareResourcesClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetAllShareResourcesAsync("<filter>", "<orderby>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("receivedSharesCount").ToString());
+    Console.WriteLine(result[0].GetProperty("sentSharesCount").ToString());
+    Console.WriteLine(result[0].GetProperty("storeKind").ToString());
+    Console.WriteLine(result[0].GetProperty("storeReference").GetProperty("referenceName").ToString());
+    Console.WriteLine(result[0].GetProperty("storeReference").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetAllShareResources(string,string,RequestContext)">
-<example>
-This sample shows how to call GetAllShareResources with required parameters and parse the result.
+      <example>
+This sample shows how to call GetAllShareResources and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new ShareResourcesClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ShareResourcesClient client = new ShareResourcesClient(endpoint, credential);
 
-foreach (var item in client.GetAllShareResources("<filter>", "<orderby>", new RequestContext()))
+foreach (BinaryData item in client.GetAllShareResources(null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("receivedSharesCount").ToString());
-    Console.WriteLine(result.GetProperty("sentSharesCount").ToString());
-    Console.WriteLine(result.GetProperty("storeKind").ToString());
-    Console.WriteLine(result.GetProperty("storeReference").GetProperty("referenceName").ToString());
-    Console.WriteLine(result.GetProperty("storeReference").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("type").ToString());
+    Console.WriteLine(result[0].ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetAllShareResources with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+ShareResourcesClient client = new ShareResourcesClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetAllShareResources("<filter>", "<orderby>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("receivedSharesCount").ToString());
+    Console.WriteLine(result[0].GetProperty("sentSharesCount").ToString());
+    Console.WriteLine(result[0].GetProperty("storeKind").ToString());
+    Console.WriteLine(result[0].GetProperty("storeReference").GetProperty("referenceName").ToString());
+    Console.WriteLine(result[0].GetProperty("storeReference").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Sharing/tests/Generated/Samples/Samples_ReceivedSharesClient.cs b/sdk/purview/Azure.Analytics.Purview.Sharing/tests/Generated/Samples/Samples_ReceivedSharesClient.cs
index 4114ea1ab3be..b7186bb291cd 100644
--- a/sdk/purview/Azure.Analytics.Purview.Sharing/tests/Generated/Samples/Samples_ReceivedSharesClient.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Sharing/tests/Generated/Samples/Samples_ReceivedSharesClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Sharing;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +23,11 @@ public class Samples_ReceivedSharesClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetReceivedShare()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            Response response = client.GetReceivedShare("<receivedShareId>", new RequestContext());
+            Response response = client.GetReceivedShare("<receivedShareId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
@@ -38,11 +38,11 @@ public void Example_GetReceivedShare()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetReceivedShare_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            Response response = client.GetReceivedShare("<receivedShareId>", new RequestContext());
+            Response response = client.GetReceivedShare("<receivedShareId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
@@ -54,11 +54,11 @@ public void Example_GetReceivedShare_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetReceivedShare_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            Response response = await client.GetReceivedShareAsync("<receivedShareId>", new RequestContext());
+            Response response = await client.GetReceivedShareAsync("<receivedShareId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
@@ -69,11 +69,11 @@ public async Task Example_GetReceivedShare_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetReceivedShare_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            Response response = await client.GetReceivedShareAsync("<receivedShareId>", new RequestContext());
+            Response response = await client.GetReceivedShareAsync("<receivedShareId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
@@ -85,13 +85,12 @@ public async Task Example_GetReceivedShare_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_ActivateTenantEmailRegistration()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = client.ActivateTenantEmailRegistration(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.ActivateTenantEmailRegistration(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -101,19 +100,18 @@ public void Example_ActivateTenantEmailRegistration()
         [Ignore("Only validating compilation of examples")]
         public void Example_ActivateTenantEmailRegistration_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    activationCode = "<activationCode>",
+                    ["activationCode"] = "<activationCode>",
                 },
-            };
-
-            Response response = client.ActivateTenantEmailRegistration(RequestContent.Create(data));
+            });
+            Response response = client.ActivateTenantEmailRegistration(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("activationCode").ToString());
@@ -130,13 +128,12 @@ public void Example_ActivateTenantEmailRegistration_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ActivateTenantEmailRegistration_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            Response response = await client.ActivateTenantEmailRegistrationAsync(RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.ActivateTenantEmailRegistrationAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -146,19 +143,18 @@ public async Task Example_ActivateTenantEmailRegistration_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ActivateTenantEmailRegistration_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    activationCode = "<activationCode>",
+                    ["activationCode"] = "<activationCode>",
                 },
-            };
-
-            Response response = await client.ActivateTenantEmailRegistrationAsync(RequestContent.Create(data));
+            });
+            Response response = await client.ActivateTenantEmailRegistrationAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("activationCode").ToString());
@@ -175,11 +171,11 @@ public async Task Example_ActivateTenantEmailRegistration_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_RegisterTenantEmailRegistration()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            Response response = client.RegisterTenantEmailRegistration(new RequestContext());
+            Response response = client.RegisterTenantEmailRegistration(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -189,11 +185,11 @@ public void Example_RegisterTenantEmailRegistration()
         [Ignore("Only validating compilation of examples")]
         public void Example_RegisterTenantEmailRegistration_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            Response response = client.RegisterTenantEmailRegistration(new RequestContext());
+            Response response = client.RegisterTenantEmailRegistration(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("activationCode").ToString());
@@ -210,11 +206,11 @@ public void Example_RegisterTenantEmailRegistration_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RegisterTenantEmailRegistration_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            Response response = await client.RegisterTenantEmailRegistrationAsync(new RequestContext());
+            Response response = await client.RegisterTenantEmailRegistrationAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -224,11 +220,11 @@ public async Task Example_RegisterTenantEmailRegistration_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RegisterTenantEmailRegistration_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            Response response = await client.RegisterTenantEmailRegistrationAsync(new RequestContext());
+            Response response = await client.RegisterTenantEmailRegistrationAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("properties").GetProperty("activationCode").ToString());
@@ -245,15 +241,15 @@ public async Task Example_RegisterTenantEmailRegistration_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllAttachedReceivedShares()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            foreach (var item in client.GetAllAttachedReceivedShares("<referenceName>", "<filter>", "<orderby>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllAttachedReceivedShares("<referenceName>", null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("shareKind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -261,16 +257,16 @@ public void Example_GetAllAttachedReceivedShares()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllAttachedReceivedShares_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            foreach (var item in client.GetAllAttachedReceivedShares("<referenceName>", "<filter>", "<orderby>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllAttachedReceivedShares("<referenceName>", "<filter>", "<orderby>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("shareKind").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
             }
         }
 
@@ -278,15 +274,15 @@ public void Example_GetAllAttachedReceivedShares_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllAttachedReceivedShares_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            await foreach (var item in client.GetAllAttachedReceivedSharesAsync("<referenceName>", "<filter>", "<orderby>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllAttachedReceivedSharesAsync("<referenceName>", null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("shareKind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -294,16 +290,16 @@ public async Task Example_GetAllAttachedReceivedShares_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllAttachedReceivedShares_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            await foreach (var item in client.GetAllAttachedReceivedSharesAsync("<referenceName>", "<filter>", "<orderby>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllAttachedReceivedSharesAsync("<referenceName>", "<filter>", "<orderby>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("shareKind").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
             }
         }
 
@@ -311,15 +307,15 @@ public async Task Example_GetAllAttachedReceivedShares_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllDetachedReceivedShares()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            foreach (var item in client.GetAllDetachedReceivedShares("<filter>", "<orderby>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllDetachedReceivedShares(null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("shareKind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -327,16 +323,16 @@ public void Example_GetAllDetachedReceivedShares()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllDetachedReceivedShares_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            foreach (var item in client.GetAllDetachedReceivedShares("<filter>", "<orderby>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllDetachedReceivedShares("<filter>", "<orderby>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("shareKind").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
             }
         }
 
@@ -344,15 +340,15 @@ public void Example_GetAllDetachedReceivedShares_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllDetachedReceivedShares_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            await foreach (var item in client.GetAllDetachedReceivedSharesAsync("<filter>", "<orderby>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllDetachedReceivedSharesAsync(null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("shareKind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -360,16 +356,16 @@ public async Task Example_GetAllDetachedReceivedShares_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllDetachedReceivedShares_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            await foreach (var item in client.GetAllDetachedReceivedSharesAsync("<filter>", "<orderby>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllDetachedReceivedSharesAsync("<filter>", "<orderby>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("shareKind").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
             }
         }
 
@@ -377,19 +373,18 @@ public async Task Example_GetAllDetachedReceivedShares_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrReplaceReceivedShare()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new { },
-                shareKind = "InPlace",
-            };
-
-            var operation = client.CreateOrReplaceReceivedShare(WaitUntil.Completed, "<receivedShareId>", RequestContent.Create(data));
-
+                ["properties"] = new Dictionary<string, object>(),
+                ["shareKind"] = "InPlace",
+            });
+            Operation<BinaryData> operation = client.CreateOrReplaceReceivedShare(WaitUntil.Completed, "<receivedShareId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
             Console.WriteLine(result.ToString());
@@ -399,39 +394,38 @@ public void Example_CreateOrReplaceReceivedShare()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrReplaceReceivedShare_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    assetStoreKind = "AdlsGen2Account",
-                    displayName = "<displayName>",
-                    shareStatus = "Detached",
-                    sink = new
+                    ["assetStoreKind"] = "AdlsGen2Account",
+                    ["displayName"] = "<displayName>",
+                    ["shareStatus"] = "Detached",
+                    ["sink"] = new Dictionary<string, object>()
                     {
-                        properties = new
+                        ["properties"] = new Dictionary<string, object>()
                         {
-                            containerName = "<containerName>",
-                            folder = "<folder>",
-                            mountPath = "<mountPath>",
+                            ["containerName"] = "<containerName>",
+                            ["folder"] = "<folder>",
+                            ["mountPath"] = "<mountPath>",
                         },
-                        storeKind = "AdlsGen2Account",
-                        storeReference = new
+                        ["storeKind"] = "AdlsGen2Account",
+                        ["storeReference"] = new Dictionary<string, object>()
                         {
-                            referenceName = "<referenceName>",
-                            type = "ArmResourceReference",
+                            ["referenceName"] = "<referenceName>",
+                            ["type"] = "ArmResourceReference",
                         },
                     },
                 },
-                shareKind = "InPlace",
-            };
-
-            var operation = client.CreateOrReplaceReceivedShare(WaitUntil.Completed, "<receivedShareId>", RequestContent.Create(data));
-
+                ["shareKind"] = "InPlace",
+            });
+            Operation<BinaryData> operation = client.CreateOrReplaceReceivedShare(WaitUntil.Completed, "<receivedShareId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -442,19 +436,18 @@ public void Example_CreateOrReplaceReceivedShare_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrReplaceReceivedShare_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new { },
-                shareKind = "InPlace",
-            };
-
-            var operation = await client.CreateOrReplaceReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", RequestContent.Create(data));
-
+                ["properties"] = new Dictionary<string, object>(),
+                ["shareKind"] = "InPlace",
+            });
+            Operation<BinaryData> operation = await client.CreateOrReplaceReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
             Console.WriteLine(result.ToString());
@@ -464,39 +457,38 @@ public async Task Example_CreateOrReplaceReceivedShare_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrReplaceReceivedShare_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    assetStoreKind = "AdlsGen2Account",
-                    displayName = "<displayName>",
-                    shareStatus = "Detached",
-                    sink = new
+                    ["assetStoreKind"] = "AdlsGen2Account",
+                    ["displayName"] = "<displayName>",
+                    ["shareStatus"] = "Detached",
+                    ["sink"] = new Dictionary<string, object>()
                     {
-                        properties = new
+                        ["properties"] = new Dictionary<string, object>()
                         {
-                            containerName = "<containerName>",
-                            folder = "<folder>",
-                            mountPath = "<mountPath>",
+                            ["containerName"] = "<containerName>",
+                            ["folder"] = "<folder>",
+                            ["mountPath"] = "<mountPath>",
                         },
-                        storeKind = "AdlsGen2Account",
-                        storeReference = new
+                        ["storeKind"] = "AdlsGen2Account",
+                        ["storeReference"] = new Dictionary<string, object>()
                         {
-                            referenceName = "<referenceName>",
-                            type = "ArmResourceReference",
+                            ["referenceName"] = "<referenceName>",
+                            ["type"] = "ArmResourceReference",
                         },
                     },
                 },
-                shareKind = "InPlace",
-            };
-
-            var operation = await client.CreateOrReplaceReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", RequestContent.Create(data));
-
+                ["shareKind"] = "InPlace",
+            });
+            Operation<BinaryData> operation = await client.CreateOrReplaceReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -507,13 +499,13 @@ public async Task Example_CreateOrReplaceReceivedShare_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteReceivedShare()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
-
-            var operation = client.DeleteReceivedShare(WaitUntil.Completed, "<receivedShareId>", new RequestContext());
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.DeleteReceivedShare(WaitUntil.Completed, "<receivedShareId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("status").ToString());
         }
@@ -522,13 +514,13 @@ public void Example_DeleteReceivedShare()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteReceivedShare_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
-
-            var operation = client.DeleteReceivedShare(WaitUntil.Completed, "<receivedShareId>", new RequestContext());
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.DeleteReceivedShare(WaitUntil.Completed, "<receivedShareId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("endTime").ToString());
             Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
@@ -543,13 +535,13 @@ public void Example_DeleteReceivedShare_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteReceivedShare_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
-
-            var operation = await client.DeleteReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", new RequestContext());
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.DeleteReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("status").ToString());
         }
@@ -558,13 +550,13 @@ public async Task Example_DeleteReceivedShare_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteReceivedShare_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ReceivedSharesClient(endpoint, credential);
-
-            var operation = await client.DeleteReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", new RequestContext());
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ReceivedSharesClient client = new ReceivedSharesClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.DeleteReceivedShareAsync(WaitUntil.Completed, "<receivedShareId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("endTime").ToString());
             Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
diff --git a/sdk/purview/Azure.Analytics.Purview.Sharing/tests/Generated/Samples/Samples_SentSharesClient.cs b/sdk/purview/Azure.Analytics.Purview.Sharing/tests/Generated/Samples/Samples_SentSharesClient.cs
index 7e48a61a61d0..f3e17b354bf2 100644
--- a/sdk/purview/Azure.Analytics.Purview.Sharing/tests/Generated/Samples/Samples_SentSharesClient.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Sharing/tests/Generated/Samples/Samples_SentSharesClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Sharing;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +23,11 @@ public class Samples_SentSharesClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSentShare()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            Response response = client.GetSentShare("<sentShareId>", new RequestContext());
+            Response response = client.GetSentShare("<sentShareId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
@@ -38,11 +38,11 @@ public void Example_GetSentShare()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSentShare_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            Response response = client.GetSentShare("<sentShareId>", new RequestContext());
+            Response response = client.GetSentShare("<sentShareId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
@@ -54,11 +54,11 @@ public void Example_GetSentShare_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSentShare_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            Response response = await client.GetSentShareAsync("<sentShareId>", new RequestContext());
+            Response response = await client.GetSentShareAsync("<sentShareId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
@@ -69,11 +69,11 @@ public async Task Example_GetSentShare_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSentShare_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            Response response = await client.GetSentShareAsync("<sentShareId>", new RequestContext());
+            Response response = await client.GetSentShareAsync("<sentShareId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
@@ -85,11 +85,11 @@ public async Task Example_GetSentShare_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSentShareInvitation()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            Response response = client.GetSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+            Response response = client.GetSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("invitationKind").ToString());
@@ -100,11 +100,11 @@ public void Example_GetSentShareInvitation()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSentShareInvitation_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            Response response = client.GetSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+            Response response = client.GetSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("invitationKind").ToString());
@@ -116,11 +116,11 @@ public void Example_GetSentShareInvitation_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSentShareInvitation_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            Response response = await client.GetSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+            Response response = await client.GetSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("invitationKind").ToString());
@@ -131,11 +131,11 @@ public async Task Example_GetSentShareInvitation_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSentShareInvitation_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            Response response = await client.GetSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+            Response response = await client.GetSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("invitationKind").ToString());
@@ -147,21 +147,20 @@ public async Task Example_GetSentShareInvitation_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateSentShareInvitation()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    targetActiveDirectoryId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-                    targetObjectId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                    ["targetActiveDirectoryId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                    ["targetObjectId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
                 },
-                invitationKind = "Service",
-            };
-
-            Response response = client.CreateSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", RequestContent.Create(data));
+                ["invitationKind"] = "Service",
+            });
+            Response response = client.CreateSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("invitationKind").ToString());
@@ -172,23 +171,22 @@ public void Example_CreateSentShareInvitation()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateSentShareInvitation_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    expirationDate = "2022-05-10T18:57:31.2311892Z",
-                    shareStatus = "Detached",
-                    targetActiveDirectoryId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-                    targetObjectId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                    ["expirationDate"] = "2022-05-10T18:57:31.2311892Z",
+                    ["shareStatus"] = "Detached",
+                    ["targetActiveDirectoryId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                    ["targetObjectId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
                 },
-                invitationKind = "Service",
-            };
-
-            Response response = client.CreateSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", RequestContent.Create(data));
+                ["invitationKind"] = "Service",
+            });
+            Response response = client.CreateSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("invitationKind").ToString());
@@ -200,21 +198,20 @@ public void Example_CreateSentShareInvitation_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateSentShareInvitation_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    targetActiveDirectoryId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-                    targetObjectId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                    ["targetActiveDirectoryId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                    ["targetObjectId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
                 },
-                invitationKind = "Service",
-            };
-
-            Response response = await client.CreateSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", RequestContent.Create(data));
+                ["invitationKind"] = "Service",
+            });
+            Response response = await client.CreateSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("invitationKind").ToString());
@@ -225,23 +222,22 @@ public async Task Example_CreateSentShareInvitation_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateSentShareInvitation_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    expirationDate = "2022-05-10T18:57:31.2311892Z",
-                    shareStatus = "Detached",
-                    targetActiveDirectoryId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-                    targetObjectId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                    ["expirationDate"] = "2022-05-10T18:57:31.2311892Z",
+                    ["shareStatus"] = "Detached",
+                    ["targetActiveDirectoryId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                    ["targetObjectId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
                 },
-                invitationKind = "Service",
-            };
-
-            Response response = await client.CreateSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", RequestContent.Create(data));
+                ["invitationKind"] = "Service",
+            });
+            Response response = await client.CreateSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("invitationKind").ToString());
@@ -253,11 +249,11 @@ public async Task Example_CreateSentShareInvitation_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_NotifyUserSentShareInvitation()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            Response response = client.NotifyUserSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+            Response response = client.NotifyUserSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("invitationKind").ToString());
@@ -268,11 +264,11 @@ public void Example_NotifyUserSentShareInvitation()
         [Ignore("Only validating compilation of examples")]
         public void Example_NotifyUserSentShareInvitation_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            Response response = client.NotifyUserSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+            Response response = client.NotifyUserSentShareInvitation("<sentShareId>", "<sentShareInvitationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("invitationKind").ToString());
@@ -284,11 +280,11 @@ public void Example_NotifyUserSentShareInvitation_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_NotifyUserSentShareInvitation_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            Response response = await client.NotifyUserSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+            Response response = await client.NotifyUserSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("invitationKind").ToString());
@@ -299,11 +295,11 @@ public async Task Example_NotifyUserSentShareInvitation_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_NotifyUserSentShareInvitation_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            Response response = await client.NotifyUserSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+            Response response = await client.NotifyUserSentShareInvitationAsync("<sentShareId>", "<sentShareInvitationId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("invitationKind").ToString());
@@ -315,15 +311,15 @@ public async Task Example_NotifyUserSentShareInvitation_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllSentShares()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            foreach (var item in client.GetAllSentShares("<referenceName>", "<filter>", "<orderby>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllSentShares("<referenceName>", null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("shareKind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -331,16 +327,16 @@ public void Example_GetAllSentShares()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllSentShares_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            foreach (var item in client.GetAllSentShares("<referenceName>", "<filter>", "<orderby>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllSentShares("<referenceName>", "<filter>", "<orderby>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("shareKind").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
             }
         }
 
@@ -348,15 +344,15 @@ public void Example_GetAllSentShares_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllSentShares_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            await foreach (var item in client.GetAllSentSharesAsync("<referenceName>", "<filter>", "<orderby>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllSentSharesAsync("<referenceName>", null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("shareKind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -364,16 +360,16 @@ public async Task Example_GetAllSentShares_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllSentShares_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            await foreach (var item in client.GetAllSentSharesAsync("<referenceName>", "<filter>", "<orderby>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllSentSharesAsync("<referenceName>", "<filter>", "<orderby>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("shareKind").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("shareKind").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
             }
         }
 
@@ -381,15 +377,15 @@ public async Task Example_GetAllSentShares_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllSentShareInvitations()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            foreach (var item in client.GetAllSentShareInvitations("<sentShareId>", "<filter>", "<orderby>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllSentShareInvitations("<sentShareId>", null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("invitationKind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("invitationKind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -397,16 +393,16 @@ public void Example_GetAllSentShareInvitations()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllSentShareInvitations_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            foreach (var item in client.GetAllSentShareInvitations("<sentShareId>", "<filter>", "<orderby>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllSentShareInvitations("<sentShareId>", "<filter>", "<orderby>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("invitationKind").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("invitationKind").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
             }
         }
 
@@ -414,15 +410,15 @@ public void Example_GetAllSentShareInvitations_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllSentShareInvitations_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            await foreach (var item in client.GetAllSentShareInvitationsAsync("<sentShareId>", "<filter>", "<orderby>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllSentShareInvitationsAsync("<sentShareId>", null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("invitationKind").ToString());
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].GetProperty("invitationKind").ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -430,16 +426,16 @@ public async Task Example_GetAllSentShareInvitations_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllSentShareInvitations_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            await foreach (var item in client.GetAllSentShareInvitationsAsync("<sentShareId>", "<filter>", "<orderby>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllSentShareInvitationsAsync("<sentShareId>", "<filter>", "<orderby>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("invitationKind").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("invitationKind").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
             }
         }
 
@@ -447,35 +443,36 @@ public async Task Example_GetAllSentShareInvitations_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrReplaceSentShare()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    artifact = new
+                    ["artifact"] = new Dictionary<string, object>()
                     {
-                        properties = new
+                        ["properties"] = new Dictionary<string, object>()
                         {
-                            paths = new[] {
-                    new {
-                        containerName = "<containerName>",
-                    }
-                },
+                            ["paths"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["containerName"] = "<containerName>",
+}
+},
                         },
-                        storeKind = "AdlsGen2Account",
-                        storeReference = new { },
+                        ["storeKind"] = "AdlsGen2Account",
+                        ["storeReference"] = new Dictionary<string, object>(),
                     },
-                    displayName = "<displayName>",
+                    ["displayName"] = "<displayName>",
                 },
-                shareKind = "InPlace",
-            };
-
-            var operation = client.CreateOrReplaceSentShare(WaitUntil.Completed, "<sentShareId>", RequestContent.Create(data));
-
+                ["shareKind"] = "InPlace",
+            });
+            Operation<BinaryData> operation = client.CreateOrReplaceSentShare(WaitUntil.Completed, "<sentShareId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
             Console.WriteLine(result.ToString());
@@ -485,42 +482,43 @@ public void Example_CreateOrReplaceSentShare()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrReplaceSentShare_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    artifact = new
+                    ["artifact"] = new Dictionary<string, object>()
                     {
-                        properties = new
+                        ["properties"] = new Dictionary<string, object>()
                         {
-                            paths = new[] {
-                    new {
-                        containerName = "<containerName>",
-                        receiverPath = "<receiverPath>",
-                        senderPath = "<senderPath>",
-                    }
-                },
+                            ["paths"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["containerName"] = "<containerName>",
+["receiverPath"] = "<receiverPath>",
+["senderPath"] = "<senderPath>",
+}
+},
                         },
-                        storeKind = "AdlsGen2Account",
-                        storeReference = new
+                        ["storeKind"] = "AdlsGen2Account",
+                        ["storeReference"] = new Dictionary<string, object>()
                         {
-                            referenceName = "<referenceName>",
-                            type = "ArmResourceReference",
+                            ["referenceName"] = "<referenceName>",
+                            ["type"] = "ArmResourceReference",
                         },
                     },
-                    description = "<description>",
-                    displayName = "<displayName>",
+                    ["description"] = "<description>",
+                    ["displayName"] = "<displayName>",
                 },
-                shareKind = "InPlace",
-            };
-
-            var operation = client.CreateOrReplaceSentShare(WaitUntil.Completed, "<sentShareId>", RequestContent.Create(data));
-
+                ["shareKind"] = "InPlace",
+            });
+            Operation<BinaryData> operation = client.CreateOrReplaceSentShare(WaitUntil.Completed, "<sentShareId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -531,35 +529,36 @@ public void Example_CreateOrReplaceSentShare_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrReplaceSentShare_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    artifact = new
+                    ["artifact"] = new Dictionary<string, object>()
                     {
-                        properties = new
+                        ["properties"] = new Dictionary<string, object>()
                         {
-                            paths = new[] {
-                    new {
-                        containerName = "<containerName>",
-                    }
-                },
+                            ["paths"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["containerName"] = "<containerName>",
+}
+},
                         },
-                        storeKind = "AdlsGen2Account",
-                        storeReference = new { },
+                        ["storeKind"] = "AdlsGen2Account",
+                        ["storeReference"] = new Dictionary<string, object>(),
                     },
-                    displayName = "<displayName>",
+                    ["displayName"] = "<displayName>",
                 },
-                shareKind = "InPlace",
-            };
-
-            var operation = await client.CreateOrReplaceSentShareAsync(WaitUntil.Completed, "<sentShareId>", RequestContent.Create(data));
-
+                ["shareKind"] = "InPlace",
+            });
+            Operation<BinaryData> operation = await client.CreateOrReplaceSentShareAsync(WaitUntil.Completed, "<sentShareId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
             Console.WriteLine(result.ToString());
@@ -569,42 +568,43 @@ public async Task Example_CreateOrReplaceSentShare_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrReplaceSentShare_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                properties = new
+                ["properties"] = new Dictionary<string, object>()
                 {
-                    artifact = new
+                    ["artifact"] = new Dictionary<string, object>()
                     {
-                        properties = new
+                        ["properties"] = new Dictionary<string, object>()
                         {
-                            paths = new[] {
-                    new {
-                        containerName = "<containerName>",
-                        receiverPath = "<receiverPath>",
-                        senderPath = "<senderPath>",
-                    }
-                },
+                            ["paths"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["containerName"] = "<containerName>",
+["receiverPath"] = "<receiverPath>",
+["senderPath"] = "<senderPath>",
+}
+},
                         },
-                        storeKind = "AdlsGen2Account",
-                        storeReference = new
+                        ["storeKind"] = "AdlsGen2Account",
+                        ["storeReference"] = new Dictionary<string, object>()
                         {
-                            referenceName = "<referenceName>",
-                            type = "ArmResourceReference",
+                            ["referenceName"] = "<referenceName>",
+                            ["type"] = "ArmResourceReference",
                         },
                     },
-                    description = "<description>",
-                    displayName = "<displayName>",
+                    ["description"] = "<description>",
+                    ["displayName"] = "<displayName>",
                 },
-                shareKind = "InPlace",
-            };
-
-            var operation = await client.CreateOrReplaceSentShareAsync(WaitUntil.Completed, "<sentShareId>", RequestContent.Create(data));
-
+                ["shareKind"] = "InPlace",
+            });
+            Operation<BinaryData> operation = await client.CreateOrReplaceSentShareAsync(WaitUntil.Completed, "<sentShareId>", content);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("shareKind").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -615,13 +615,13 @@ public async Task Example_CreateOrReplaceSentShare_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteSentShare()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
-
-            var operation = client.DeleteSentShare(WaitUntil.Completed, "<sentShareId>", new RequestContext());
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.DeleteSentShare(WaitUntil.Completed, "<sentShareId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("status").ToString());
         }
@@ -630,13 +630,13 @@ public void Example_DeleteSentShare()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteSentShare_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
-
-            var operation = client.DeleteSentShare(WaitUntil.Completed, "<sentShareId>", new RequestContext());
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.DeleteSentShare(WaitUntil.Completed, "<sentShareId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("endTime").ToString());
             Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
@@ -651,13 +651,13 @@ public void Example_DeleteSentShare_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteSentShare_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
-
-            var operation = await client.DeleteSentShareAsync(WaitUntil.Completed, "<sentShareId>", new RequestContext());
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.DeleteSentShareAsync(WaitUntil.Completed, "<sentShareId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("status").ToString());
         }
@@ -666,13 +666,13 @@ public async Task Example_DeleteSentShare_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteSentShare_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
-
-            var operation = await client.DeleteSentShareAsync(WaitUntil.Completed, "<sentShareId>", new RequestContext());
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.DeleteSentShareAsync(WaitUntil.Completed, "<sentShareId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("endTime").ToString());
             Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
@@ -687,13 +687,13 @@ public async Task Example_DeleteSentShare_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteSentShareInvitation()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
-
-            var operation = client.DeleteSentShareInvitation(WaitUntil.Completed, "<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.DeleteSentShareInvitation(WaitUntil.Completed, "<sentShareId>", "<sentShareInvitationId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("status").ToString());
         }
@@ -702,13 +702,13 @@ public void Example_DeleteSentShareInvitation()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteSentShareInvitation_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
-
-            var operation = client.DeleteSentShareInvitation(WaitUntil.Completed, "<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
+            Operation<BinaryData> operation = client.DeleteSentShareInvitation(WaitUntil.Completed, "<sentShareId>", "<sentShareInvitationId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("endTime").ToString());
             Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
@@ -723,13 +723,13 @@ public void Example_DeleteSentShareInvitation_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteSentShareInvitation_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
-
-            var operation = await client.DeleteSentShareInvitationAsync(WaitUntil.Completed, "<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.DeleteSentShareInvitationAsync(WaitUntil.Completed, "<sentShareId>", "<sentShareInvitationId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("status").ToString());
         }
@@ -738,13 +738,13 @@ public async Task Example_DeleteSentShareInvitation_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteSentShareInvitation_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new SentSharesClient(endpoint, credential);
-
-            var operation = await client.DeleteSentShareInvitationAsync(WaitUntil.Completed, "<sentShareId>", "<sentShareInvitationId>", new RequestContext());
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            SentSharesClient client = new SentSharesClient(endpoint, credential);
 
+            Operation<BinaryData> operation = await client.DeleteSentShareInvitationAsync(WaitUntil.Completed, "<sentShareId>", "<sentShareInvitationId>", null);
             BinaryData responseData = operation.Value;
+
             JsonElement result = JsonDocument.Parse(responseData.ToStream()).RootElement;
             Console.WriteLine(result.GetProperty("endTime").ToString());
             Console.WriteLine(result.GetProperty("error").GetProperty("code").ToString());
diff --git a/sdk/purview/Azure.Analytics.Purview.Sharing/tests/Generated/Samples/Samples_ShareResourcesClient.cs b/sdk/purview/Azure.Analytics.Purview.Sharing/tests/Generated/Samples/Samples_ShareResourcesClient.cs
index 46c8a77140b1..281691e0a65d 100644
--- a/sdk/purview/Azure.Analytics.Purview.Sharing/tests/Generated/Samples/Samples_ShareResourcesClient.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Sharing/tests/Generated/Samples/Samples_ShareResourcesClient.cs
@@ -6,11 +6,9 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
-using Azure;
+using Azure.Analytics.Purview.Sharing;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,14 +21,14 @@ public class Samples_ShareResourcesClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllShareResources()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ShareResourcesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ShareResourcesClient client = new ShareResourcesClient(endpoint, credential);
 
-            foreach (var item in client.GetAllShareResources("<filter>", "<orderby>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllShareResources(null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -38,20 +36,20 @@ public void Example_GetAllShareResources()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetAllShareResources_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ShareResourcesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ShareResourcesClient client = new ShareResourcesClient(endpoint, credential);
 
-            foreach (var item in client.GetAllShareResources("<filter>", "<orderby>", new RequestContext()))
+            foreach (BinaryData item in client.GetAllShareResources("<filter>", "<orderby>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("receivedSharesCount").ToString());
-                Console.WriteLine(result.GetProperty("sentSharesCount").ToString());
-                Console.WriteLine(result.GetProperty("storeKind").ToString());
-                Console.WriteLine(result.GetProperty("storeReference").GetProperty("referenceName").ToString());
-                Console.WriteLine(result.GetProperty("storeReference").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("receivedSharesCount").ToString());
+                Console.WriteLine(result[0].GetProperty("sentSharesCount").ToString());
+                Console.WriteLine(result[0].GetProperty("storeKind").ToString());
+                Console.WriteLine(result[0].GetProperty("storeReference").GetProperty("referenceName").ToString());
+                Console.WriteLine(result[0].GetProperty("storeReference").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
             }
         }
 
@@ -59,14 +57,14 @@ public void Example_GetAllShareResources_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllShareResources_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ShareResourcesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ShareResourcesClient client = new ShareResourcesClient(endpoint, credential);
 
-            await foreach (var item in client.GetAllShareResourcesAsync("<filter>", "<orderby>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllShareResourcesAsync(null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.ToString());
+                Console.WriteLine(result[0].ToString());
             }
         }
 
@@ -74,20 +72,20 @@ public async Task Example_GetAllShareResources_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetAllShareResources_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new ShareResourcesClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            ShareResourcesClient client = new ShareResourcesClient(endpoint, credential);
 
-            await foreach (var item in client.GetAllShareResourcesAsync("<filter>", "<orderby>", new RequestContext()))
+            await foreach (BinaryData item in client.GetAllShareResourcesAsync("<filter>", "<orderby>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("receivedSharesCount").ToString());
-                Console.WriteLine(result.GetProperty("sentSharesCount").ToString());
-                Console.WriteLine(result.GetProperty("storeKind").ToString());
-                Console.WriteLine(result.GetProperty("storeReference").GetProperty("referenceName").ToString());
-                Console.WriteLine(result.GetProperty("storeReference").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("receivedSharesCount").ToString());
+                Console.WriteLine(result[0].GetProperty("sentSharesCount").ToString());
+                Console.WriteLine(result[0].GetProperty("storeKind").ToString());
+                Console.WriteLine(result[0].GetProperty("storeReference").GetProperty("referenceName").ToString());
+                Console.WriteLine(result[0].GetProperty("storeReference").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
             }
         }
     }
diff --git a/sdk/purview/Azure.Analytics.Purview.Workflows/src/Generated/Docs/PurviewWorkflowServiceClient.xml b/sdk/purview/Azure.Analytics.Purview.Workflows/src/Generated/Docs/PurviewWorkflowServiceClient.xml
index 1add3bedffd2..6a978eb392ca 100644
--- a/sdk/purview/Azure.Analytics.Purview.Workflows/src/Generated/Docs/PurviewWorkflowServiceClient.xml
+++ b/sdk/purview/Azure.Analytics.Purview.Workflows/src/Generated/Docs/PurviewWorkflowServiceClient.xml
@@ -2,14 +2,30 @@
 <doc>
   <members>
     <member name="GetWorkflowAsync(Guid,RequestContext)">
-<example>
-This sample shows how to call GetWorkflowAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetWorkflowAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = await client.GetWorkflowAsync(Guid.NewGuid(), new RequestContext());
+Response response = await client.GetWorkflowAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("actionDag").ToString());
+Console.WriteLine(result.GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("isEnabled").ToString());
+Console.WriteLine(result.GetProperty("description").ToString());
+]]></code>
+This sample shows how to call GetWorkflowAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+Response response = await client.GetWorkflowAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -25,18 +41,33 @@ Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("isEnabled").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetWorkflow(Guid,RequestContext)">
-<example>
-This sample shows how to call GetWorkflow with required parameters and parse the result.
+      <example>
+This sample shows how to call GetWorkflow and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = client.GetWorkflow(Guid.NewGuid(), new RequestContext());
+Response response = client.GetWorkflow(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("actionDag").ToString());
+Console.WriteLine(result.GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("name").ToString());
+Console.WriteLine(result.GetProperty("isEnabled").ToString());
+Console.WriteLine(result.GetProperty("description").ToString());
+]]></code>
+This sample shows how to call GetWorkflow with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+Response response = client.GetWorkflow(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -52,29 +83,30 @@ Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("isEnabled").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrReplaceWorkflowAsync(Guid,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrReplaceWorkflowAsync with required parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {
-    triggers = new[] {
-        new {
-            type = "when_term_creation_is_requested",
-        }
-    },
-    name = "<name>",
-    isEnabled = true,
-    description = "<description>",
-};
-
-Response response = await client.CreateOrReplaceWorkflowAsync(Guid.NewGuid(), RequestContent.Create(data));
+      <example>
+This sample shows how to call CreateOrReplaceWorkflowAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["triggers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "when_term_creation_is_requested",
+}
+},
+    ["name"] = "<name>",
+    ["isEnabled"] = true,
+    ["description"] = "<description>",
+});
+Response response = await client.CreateOrReplaceWorkflowAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -84,28 +116,30 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("isEnabled").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 ]]></code>
-This sample shows how to call CreateOrReplaceWorkflowAsync with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {
-    triggers = new[] {
-        new {
-            type = "when_term_creation_is_requested",
-            underGlossaryHierarchy = "<underGlossaryHierarchy>",
-            underCollection = "<underCollection>",
-            underGlossary = "<underGlossary>",
-        }
-    },
-    name = "<name>",
-    isEnabled = true,
-    description = "<description>",
-    actionDag = new {},
-};
-
-Response response = await client.CreateOrReplaceWorkflowAsync(Guid.NewGuid(), RequestContent.Create(data));
+This sample shows how to call CreateOrReplaceWorkflowAsync with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["triggers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "when_term_creation_is_requested",
+["underGlossaryHierarchy"] = "<underGlossaryHierarchy>",
+["underCollection"] = "<underCollection>",
+["underGlossary"] = "<underGlossary>",
+}
+},
+    ["name"] = "<name>",
+    ["isEnabled"] = true,
+    ["description"] = "<description>",
+    ["actionDag"] = new Dictionary<string, object>(),
+});
+Response response = await client.CreateOrReplaceWorkflowAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -121,29 +155,30 @@ Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("isEnabled").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateOrReplaceWorkflow(Guid,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CreateOrReplaceWorkflow with required parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {
-    triggers = new[] {
-        new {
-            type = "when_term_creation_is_requested",
-        }
-    },
-    name = "<name>",
-    isEnabled = true,
-    description = "<description>",
-};
-
-Response response = client.CreateOrReplaceWorkflow(Guid.NewGuid(), RequestContent.Create(data));
+      <example>
+This sample shows how to call CreateOrReplaceWorkflow and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["triggers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "when_term_creation_is_requested",
+}
+},
+    ["name"] = "<name>",
+    ["isEnabled"] = true,
+    ["description"] = "<description>",
+});
+Response response = client.CreateOrReplaceWorkflow(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -153,28 +188,30 @@ Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("isEnabled").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
 ]]></code>
-This sample shows how to call CreateOrReplaceWorkflow with all parameters and request content, and how to parse the result.
-<code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {
-    triggers = new[] {
-        new {
-            type = "when_term_creation_is_requested",
-            underGlossaryHierarchy = "<underGlossaryHierarchy>",
-            underCollection = "<underCollection>",
-            underGlossary = "<underGlossary>",
-        }
-    },
-    name = "<name>",
-    isEnabled = true,
-    description = "<description>",
-    actionDag = new {},
-};
-
-Response response = client.CreateOrReplaceWorkflow(Guid.NewGuid(), RequestContent.Create(data));
+This sample shows how to call CreateOrReplaceWorkflow with all parameters and request content and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["triggers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "when_term_creation_is_requested",
+["underGlossaryHierarchy"] = "<underGlossaryHierarchy>",
+["underCollection"] = "<underCollection>",
+["underGlossary"] = "<underGlossary>",
+}
+},
+    ["name"] = "<name>",
+    ["isEnabled"] = true,
+    ["description"] = "<description>",
+    ["actionDag"] = new Dictionary<string, object>(),
+});
+Response response = client.CreateOrReplaceWorkflow(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -190,53 +227,70 @@ Console.WriteLine(result.GetProperty("updatedBy").ToString());
 Console.WriteLine(result.GetProperty("name").ToString());
 Console.WriteLine(result.GetProperty("isEnabled").ToString());
 Console.WriteLine(result.GetProperty("description").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteWorkflowAsync(Guid,RequestContext)">
-<example>
-This sample shows how to call DeleteWorkflowAsync with required parameters.
+      <example>
+This sample shows how to call DeleteWorkflowAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = await client.DeleteWorkflowAsync(Guid.NewGuid());
+Response response = await client.DeleteWorkflowAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteWorkflowAsync with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+Response response = await client.DeleteWorkflowAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="DeleteWorkflow(Guid,RequestContext)">
-<example>
-This sample shows how to call DeleteWorkflow with required parameters.
+      <example>
+This sample shows how to call DeleteWorkflow.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = client.DeleteWorkflow(Guid.NewGuid());
+Response response = client.DeleteWorkflow(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call DeleteWorkflow with all parameters.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+Response response = client.DeleteWorkflow(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="SubmitUserRequestsAsync(RequestContent,RequestContext)">
-<example>
-This sample shows how to call SubmitUserRequestsAsync with required request content, and how to parse the result.
+      <example>
+This sample shows how to call SubmitUserRequestsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-var data = new {
-    operations = new[] {
-        new {
-            type = "CreateTerm",
-            payload = new {},
-        }
-    },
-};
-
-Response response = await client.SubmitUserRequestsAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["operations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "CreateTerm",
+["payload"] = new Dictionary<string, object>(),
+}
+},
+});
+Response response = await client.SubmitUserRequestsAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("requestId").ToString());
@@ -245,23 +299,25 @@ Console.WriteLine(result.GetProperty("operations")[0].GetProperty("type").ToStri
 Console.WriteLine(result.GetProperty("operations")[0].GetProperty("payload").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call SubmitUserRequestsAsync with all request content, and how to parse the result.
+This sample shows how to call SubmitUserRequestsAsync with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-var data = new {
-    operations = new[] {
-        new {
-            type = "CreateTerm",
-            payload = new {},
-        }
-    },
-    comment = "<comment>",
-};
-
-Response response = await client.SubmitUserRequestsAsync(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["operations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "CreateTerm",
+["payload"] = new Dictionary<string, object>(),
+}
+},
+    ["comment"] = "<comment>",
+});
+Response response = await client.SubmitUserRequestsAsync(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("requestId").ToString());
@@ -271,27 +327,28 @@ Console.WriteLine(result.GetProperty("operations")[0].GetProperty("payload").ToS
 Console.WriteLine(result.GetProperty("operations")[0].GetProperty("workflowRunIds")[0].ToString());
 Console.WriteLine(result.GetProperty("comment").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="SubmitUserRequests(RequestContent,RequestContext)">
-<example>
-This sample shows how to call SubmitUserRequests with required request content, and how to parse the result.
+      <example>
+This sample shows how to call SubmitUserRequests and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {
-    operations = new[] {
-        new {
-            type = "CreateTerm",
-            payload = new {},
-        }
-    },
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = client.SubmitUserRequests(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["operations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "CreateTerm",
+["payload"] = new Dictionary<string, object>(),
+}
+},
+});
+Response response = client.SubmitUserRequests(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("requestId").ToString());
@@ -300,23 +357,25 @@ Console.WriteLine(result.GetProperty("operations")[0].GetProperty("type").ToStri
 Console.WriteLine(result.GetProperty("operations")[0].GetProperty("payload").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
 ]]></code>
-This sample shows how to call SubmitUserRequests with all request content, and how to parse the result.
+This sample shows how to call SubmitUserRequests with all request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-var data = new {
-    operations = new[] {
-        new {
-            type = "CreateTerm",
-            payload = new {},
-        }
-    },
-    comment = "<comment>",
-};
-
-Response response = client.SubmitUserRequests(RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["operations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "CreateTerm",
+["payload"] = new Dictionary<string, object>(),
+}
+},
+    ["comment"] = "<comment>",
+});
+Response response = client.SubmitUserRequests(content);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("requestId").ToString());
@@ -326,18 +385,30 @@ Console.WriteLine(result.GetProperty("operations")[0].GetProperty("payload").ToS
 Console.WriteLine(result.GetProperty("operations")[0].GetProperty("workflowRunIds")[0].ToString());
 Console.WriteLine(result.GetProperty("comment").ToString());
 Console.WriteLine(result.GetProperty("status").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetWorkflowRunAsync(Guid,RequestContext)">
-<example>
-This sample shows how to call GetWorkflowRunAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetWorkflowRunAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = await client.GetWorkflowRunAsync(Guid.NewGuid(), new RequestContext());
+Response response = await client.GetWorkflowRunAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("actionDag").ToString());
+Console.WriteLine(result.GetProperty("detail").GetProperty("runInput").ToString());
+Console.WriteLine(result.GetProperty("detail").GetProperty("actions").ToString());
+]]></code>
+This sample shows how to call GetWorkflowRunAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+Response response = await client.GetWorkflowRunAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -355,18 +426,30 @@ Console.WriteLine(result.GetProperty("cancelComment").ToString());
 Console.WriteLine(result.GetProperty("actionDag").ToString());
 Console.WriteLine(result.GetProperty("detail").GetProperty("runInput").ToString());
 Console.WriteLine(result.GetProperty("detail").GetProperty("actions").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetWorkflowRun(Guid,RequestContext)">
-<example>
-This sample shows how to call GetWorkflowRun with required parameters and parse the result.
+      <example>
+This sample shows how to call GetWorkflowRun and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+Response response = client.GetWorkflowRun(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("actionDag").ToString());
+Console.WriteLine(result.GetProperty("detail").GetProperty("runInput").ToString());
+Console.WriteLine(result.GetProperty("detail").GetProperty("actions").ToString());
+]]></code>
+This sample shows how to call GetWorkflowRun with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = client.GetWorkflowRun(Guid.NewGuid(), new RequestContext());
+Response response = client.GetWorkflowRun(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -384,74 +467,88 @@ Console.WriteLine(result.GetProperty("cancelComment").ToString());
 Console.WriteLine(result.GetProperty("actionDag").ToString());
 Console.WriteLine(result.GetProperty("detail").GetProperty("runInput").ToString());
 Console.WriteLine(result.GetProperty("detail").GetProperty("actions").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CancelWorkflowRunAsync(Guid,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CancelWorkflowRunAsync with required parameters.
+      <example>
+This sample shows how to call CancelWorkflowRunAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-var data = new {};
-
-Response response = await client.CancelWorkflowRunAsync(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.CancelWorkflowRunAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call CancelWorkflowRunAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {
-    comment = "<comment>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = await client.CancelWorkflowRunAsync(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["comment"] = "<comment>",
+});
+Response response = await client.CancelWorkflowRunAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CancelWorkflowRun(Guid,RequestContent,RequestContext)">
-<example>
-This sample shows how to call CancelWorkflowRun with required parameters.
+      <example>
+This sample shows how to call CancelWorkflowRun.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = client.CancelWorkflowRun(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.CancelWorkflowRun(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call CancelWorkflowRun with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-var data = new {
-    comment = "<comment>",
-};
-
-Response response = client.CancelWorkflowRun(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["comment"] = "<comment>",
+});
+Response response = client.CancelWorkflowRun(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetWorkflowTaskAsync(Guid,RequestContext)">
-<example>
-This sample shows how to call GetWorkflowTaskAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetWorkflowTaskAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+Response response = await client.GetWorkflowTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("workflowRunId").ToString());
+Console.WriteLine(result.GetProperty("workflowId").ToString());
+Console.WriteLine(result.GetProperty("requestor").ToString());
+Console.WriteLine(result.GetProperty("createdTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdateTime").ToString());
+Console.WriteLine(result.GetProperty("payload").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("payload").GetProperty("targetValue").ToString());
+]]></code>
+This sample shows how to call GetWorkflowTaskAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = await client.GetWorkflowTaskAsync(Guid.NewGuid(), new RequestContext());
+Response response = await client.GetWorkflowTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("type").ToString());
@@ -473,18 +570,36 @@ Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("nextExpiryNotifi
 Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expiryTime").ToString());
 Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("expireAfter").ToString());
 Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("notifyOnExpiration")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetWorkflowTask(Guid,RequestContext)">
-<example>
-This sample shows how to call GetWorkflowTask with required parameters and parse the result.
+      <example>
+This sample shows how to call GetWorkflowTask and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = client.GetWorkflowTask(Guid.NewGuid(), new RequestContext());
+Response response = client.GetWorkflowTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("workflowRunId").ToString());
+Console.WriteLine(result.GetProperty("workflowId").ToString());
+Console.WriteLine(result.GetProperty("requestor").ToString());
+Console.WriteLine(result.GetProperty("createdTime").ToString());
+Console.WriteLine(result.GetProperty("lastUpdateTime").ToString());
+Console.WriteLine(result.GetProperty("payload").GetProperty("type").ToString());
+Console.WriteLine(result.GetProperty("payload").GetProperty("targetValue").ToString());
+]]></code>
+This sample shows how to call GetWorkflowTask with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+Response response = client.GetWorkflowTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("type").ToString());
@@ -506,422 +621,543 @@ Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("nextExpiryNotifi
 Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expiryTime").ToString());
 Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("expireAfter").ToString());
 Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("notifyOnExpiration")[0].ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="ApproveApprovalTaskAsync(Guid,RequestContent,RequestContext)">
-<example>
-This sample shows how to call ApproveApprovalTaskAsync with required parameters.
+      <example>
+This sample shows how to call ApproveApprovalTaskAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-var data = new {};
-
-Response response = await client.ApproveApprovalTaskAsync(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.ApproveApprovalTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call ApproveApprovalTaskAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {
-    comment = "<comment>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = await client.ApproveApprovalTaskAsync(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["comment"] = "<comment>",
+});
+Response response = await client.ApproveApprovalTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="ApproveApprovalTask(Guid,RequestContent,RequestContext)">
-<example>
-This sample shows how to call ApproveApprovalTask with required parameters.
+      <example>
+This sample shows how to call ApproveApprovalTask.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-var data = new {};
-
-Response response = client.ApproveApprovalTask(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.ApproveApprovalTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call ApproveApprovalTask with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {
-    comment = "<comment>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = client.ApproveApprovalTask(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["comment"] = "<comment>",
+});
+Response response = client.ApproveApprovalTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RejectApprovalTaskAsync(Guid,RequestContent,RequestContext)">
-<example>
-This sample shows how to call RejectApprovalTaskAsync with required parameters.
+      <example>
+This sample shows how to call RejectApprovalTaskAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = await client.RejectApprovalTaskAsync(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.RejectApprovalTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call RejectApprovalTaskAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-var data = new {
-    comment = "<comment>",
-};
-
-Response response = await client.RejectApprovalTaskAsync(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["comment"] = "<comment>",
+});
+Response response = await client.RejectApprovalTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RejectApprovalTask(Guid,RequestContent,RequestContext)">
-<example>
-This sample shows how to call RejectApprovalTask with required parameters.
+      <example>
+This sample shows how to call RejectApprovalTask.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = client.RejectApprovalTask(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.RejectApprovalTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call RejectApprovalTask with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {
-    comment = "<comment>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = client.RejectApprovalTask(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["comment"] = "<comment>",
+});
+Response response = client.RejectApprovalTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="ReassignWorkflowTaskAsync(Guid,RequestContent,RequestContext)">
-<example>
-This sample shows how to call ReassignWorkflowTaskAsync with required parameters.
+      <example>
+This sample shows how to call ReassignWorkflowTaskAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-var data = new {};
-
-Response response = await client.ReassignWorkflowTaskAsync(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = await client.ReassignWorkflowTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call ReassignWorkflowTaskAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {
-    reassignments = new[] {
-        new {
-            reassignFrom = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-            reassignTo = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-        }
-    },
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = await client.ReassignWorkflowTaskAsync(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["reassignments"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["reassignFrom"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+["reassignTo"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+}
+},
+});
+Response response = await client.ReassignWorkflowTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="ReassignWorkflowTask(Guid,RequestContent,RequestContext)">
-<example>
-This sample shows how to call ReassignWorkflowTask with required parameters.
+      <example>
+This sample shows how to call ReassignWorkflowTask.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = client.ReassignWorkflowTask(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+Response response = client.ReassignWorkflowTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call ReassignWorkflowTask with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-var data = new {
-    reassignments = new[] {
-        new {
-            reassignFrom = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-            reassignTo = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-        }
-    },
-};
-
-Response response = client.ReassignWorkflowTask(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["reassignments"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["reassignFrom"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+["reassignTo"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+}
+},
+});
+Response response = client.ReassignWorkflowTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateTaskStatusAsync(Guid,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateTaskStatusAsync with required parameters and request content.
+      <example>
+This sample shows how to call UpdateTaskStatusAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {
-    newStatus = "NotStarted",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = await client.UpdateTaskStatusAsync(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["newStatus"] = "NotStarted",
+});
+Response response = await client.UpdateTaskStatusAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call UpdateTaskStatusAsync with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {
-    newStatus = "NotStarted",
-    comment = "<comment>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = await client.UpdateTaskStatusAsync(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["newStatus"] = "NotStarted",
+    ["comment"] = "<comment>",
+});
+Response response = await client.UpdateTaskStatusAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="UpdateTaskStatus(Guid,RequestContent,RequestContext)">
-<example>
-This sample shows how to call UpdateTaskStatus with required parameters and request content.
+      <example>
+This sample shows how to call UpdateTaskStatus.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {
-    newStatus = "NotStarted",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = client.UpdateTaskStatus(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["newStatus"] = "NotStarted",
+});
+Response response = client.UpdateTaskStatus(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call UpdateTaskStatus with all parameters and request content.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-var data = new {
-    newStatus = "NotStarted",
-    comment = "<comment>",
-};
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-Response response = client.UpdateTaskStatus(Guid.NewGuid(), RequestContent.Create(data));
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["newStatus"] = "NotStarted",
+    ["comment"] = "<comment>",
+});
+Response response = client.UpdateTaskStatus(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetWorkflowsAsync(RequestContext)">
-<example>
-This sample shows how to call GetWorkflowsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetWorkflowsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-await foreach (var item in client.GetWorkflowsAsync(new RequestContext()))
+await foreach (BinaryData item in client.GetWorkflowsAsync(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("underGlossaryHierarchy").ToString());
-    Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("underCollection").ToString());
-    Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("underGlossary").ToString());
-    Console.WriteLine(result.GetProperty("createdTime").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("lastUpdateTime").ToString());
-    Console.WriteLine(result.GetProperty("updatedBy").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("isEnabled").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("isEnabled").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetWorkflowsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetWorkflowsAsync(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("underGlossaryHierarchy").ToString());
+    Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("underCollection").ToString());
+    Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("underGlossary").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("lastUpdateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("updatedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("isEnabled").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetWorkflows(RequestContext)">
-<example>
-This sample shows how to call GetWorkflows with required parameters and parse the result.
+      <example>
+This sample shows how to call GetWorkflows and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-foreach (var item in client.GetWorkflows(new RequestContext()))
+foreach (BinaryData item in client.GetWorkflows(null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("underGlossaryHierarchy").ToString());
-    Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("underCollection").ToString());
-    Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("underGlossary").ToString());
-    Console.WriteLine(result.GetProperty("createdTime").ToString());
-    Console.WriteLine(result.GetProperty("createdBy").ToString());
-    Console.WriteLine(result.GetProperty("lastUpdateTime").ToString());
-    Console.WriteLine(result.GetProperty("updatedBy").ToString());
-    Console.WriteLine(result.GetProperty("name").ToString());
-    Console.WriteLine(result.GetProperty("isEnabled").ToString());
-    Console.WriteLine(result.GetProperty("description").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("isEnabled").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetWorkflows with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetWorkflows(null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("underGlossaryHierarchy").ToString());
+    Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("underCollection").ToString());
+    Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("underGlossary").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+    Console.WriteLine(result[0].GetProperty("lastUpdateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("updatedBy").ToString());
+    Console.WriteLine(result[0].GetProperty("name").ToString());
+    Console.WriteLine(result[0].GetProperty("isEnabled").ToString());
+    Console.WriteLine(result[0].GetProperty("description").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetWorkflowRunsAsync(string,string,IEnumerable{string},IEnumerable{string},int?,RequestContext)">
-<example>
-This sample shows how to call GetWorkflowRunsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetWorkflowRunsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-await foreach (var item in client.GetWorkflowRunsAsync("<timeWindow>", "<orderby>", new String[]{"<runStatuses>"}, new String[]{"<workflowIds>"}, 1234, new RequestContext()))
+await foreach (BinaryData item in client.GetWorkflowRunsAsync(null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("workflowId").ToString());
-    Console.WriteLine(result.GetProperty("startTime").ToString());
-    Console.WriteLine(result.GetProperty("requestor").ToString());
-    Console.WriteLine(result.GetProperty("userRequestId").ToString());
-    Console.WriteLine(result.GetProperty("runPayload").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("runPayload").GetProperty("targetValue").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("endTime").ToString());
-    Console.WriteLine(result.GetProperty("cancelTime").ToString());
-    Console.WriteLine(result.GetProperty("cancelComment").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+    Console.WriteLine(result[0].GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("requestor").ToString());
+    Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("targetValue").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetWorkflowRunsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetWorkflowRunsAsync("1d", "status desc", new List<string>()
+{
+"InProgress"
+}, new List<string>()
+{
+"<workflowIds>"
+}, 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+    Console.WriteLine(result[0].GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("requestor").ToString());
+    Console.WriteLine(result[0].GetProperty("userRequestId").ToString());
+    Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("targetValue").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("endTime").ToString());
+    Console.WriteLine(result[0].GetProperty("cancelTime").ToString());
+    Console.WriteLine(result[0].GetProperty("cancelComment").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetWorkflowRuns(string,string,IEnumerable{string},IEnumerable{string},int?,RequestContext)">
-<example>
-This sample shows how to call GetWorkflowRuns with required parameters and parse the result.
+      <example>
+This sample shows how to call GetWorkflowRuns and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-foreach (var item in client.GetWorkflowRuns("<timeWindow>", "<orderby>", new String[]{"<runStatuses>"}, new String[]{"<workflowIds>"}, 1234, new RequestContext()))
+foreach (BinaryData item in client.GetWorkflowRuns(null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("workflowId").ToString());
-    Console.WriteLine(result.GetProperty("startTime").ToString());
-    Console.WriteLine(result.GetProperty("requestor").ToString());
-    Console.WriteLine(result.GetProperty("userRequestId").ToString());
-    Console.WriteLine(result.GetProperty("runPayload").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("runPayload").GetProperty("targetValue").ToString());
-    Console.WriteLine(result.GetProperty("status").ToString());
-    Console.WriteLine(result.GetProperty("endTime").ToString());
-    Console.WriteLine(result.GetProperty("cancelTime").ToString());
-    Console.WriteLine(result.GetProperty("cancelComment").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+    Console.WriteLine(result[0].GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("requestor").ToString());
+    Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("targetValue").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetWorkflowRuns with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetWorkflowRuns("1d", "status desc", new List<string>()
+{
+"InProgress"
+}, new List<string>()
+{
+"<workflowIds>"
+}, 1234, null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+    Console.WriteLine(result[0].GetProperty("startTime").ToString());
+    Console.WriteLine(result[0].GetProperty("requestor").ToString());
+    Console.WriteLine(result[0].GetProperty("userRequestId").ToString());
+    Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("targetValue").ToString());
+    Console.WriteLine(result[0].GetProperty("status").ToString());
+    Console.WriteLine(result[0].GetProperty("endTime").ToString());
+    Console.WriteLine(result[0].GetProperty("cancelTime").ToString());
+    Console.WriteLine(result[0].GetProperty("cancelComment").ToString());
+}
+]]></code></example>
     </member>
     <member name="GetWorkflowTasksAsync(string,IEnumerable{string},string,int?,string,IEnumerable{string},IEnumerable{string},string,RequestContext)">
-<example>
-This sample shows how to call GetWorkflowTasksAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetWorkflowTasksAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-await foreach (var item in client.GetWorkflowTasksAsync("<viewMode>", new String[]{"<workflowIds>"}, "<timeWindow>", 1234, "<orderby>", new String[]{"<taskTypes>"}, new String[]{"<taskStatuses>"}, "<workflowNameKeyword>", new RequestContext()))
+await foreach (BinaryData item in client.GetWorkflowTasksAsync(null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("title").ToString());
-    Console.WriteLine(result.GetProperty("workflowRunId").ToString());
-    Console.WriteLine(result.GetProperty("workflowId").ToString());
-    Console.WriteLine(result.GetProperty("requestor").ToString());
-    Console.WriteLine(result.GetProperty("createdTime").ToString());
-    Console.WriteLine(result.GetProperty("lastUpdateTime").ToString());
-    Console.WriteLine(result.GetProperty("payload").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("payload").GetProperty("targetValue").ToString());
-    Console.WriteLine(result.GetProperty("payload").GetProperty("payload").ToString());
-    Console.WriteLine(result.GetProperty("reminderInfo").GetProperty("lastRemindTime").ToString());
-    Console.WriteLine(result.GetProperty("reminderInfo").GetProperty("nextRemindTime").ToString());
-    Console.WriteLine(result.GetProperty("reminderInfo").GetProperty("reminderSettings").ToString());
-    Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("lastExpiryNotificationTime").ToString());
-    Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("nextExpiryNotificationTime").ToString());
-    Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expiryTime").ToString());
-    Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("expireAfter").ToString());
-    Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("notifyOnExpiration")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("workflowRunId").ToString());
+    Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+    Console.WriteLine(result[0].GetProperty("requestor").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastUpdateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("payload").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("payload").GetProperty("targetValue").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetWorkflowTasksAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+await foreach (BinaryData item in client.GetWorkflowTasksAsync("<viewMode>", new List<string>()
+{
+"<workflowIds>"
+}, "1d", 1234, "status desc", new List<string>()
+{
+"Approval"
+}, new List<string>()
+{
+"InProgress"
+}, "<workflowNameKeyword>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("title").ToString());
+    Console.WriteLine(result[0].GetProperty("workflowRunId").ToString());
+    Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+    Console.WriteLine(result[0].GetProperty("requestor").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastUpdateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("payload").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("payload").GetProperty("targetValue").ToString());
+    Console.WriteLine(result[0].GetProperty("payload").GetProperty("payload").ToString());
+    Console.WriteLine(result[0].GetProperty("reminderInfo").GetProperty("lastRemindTime").ToString());
+    Console.WriteLine(result[0].GetProperty("reminderInfo").GetProperty("nextRemindTime").ToString());
+    Console.WriteLine(result[0].GetProperty("reminderInfo").GetProperty("reminderSettings").ToString());
+    Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("lastExpiryNotificationTime").ToString());
+    Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("nextExpiryNotificationTime").ToString());
+    Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("expiryTime").ToString());
+    Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("expireAfter").ToString());
+    Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("notifyOnExpiration")[0].ToString());
+}
+]]></code></example>
     </member>
     <member name="GetWorkflowTasks(string,IEnumerable{string},string,int?,string,IEnumerable{string},IEnumerable{string},string,RequestContext)">
-<example>
-This sample shows how to call GetWorkflowTasks with required parameters and parse the result.
+      <example>
+This sample shows how to call GetWorkflowTasks and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new PurviewWorkflowServiceClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-foreach (var item in client.GetWorkflowTasks("<viewMode>", new String[]{"<workflowIds>"}, "<timeWindow>", 1234, "<orderby>", new String[]{"<taskTypes>"}, new String[]{"<taskStatuses>"}, "<workflowNameKeyword>", new RequestContext()))
+foreach (BinaryData item in client.GetWorkflowTasks(null, null, null, null, null, null, null, null, null))
 {
     JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-    Console.WriteLine(result.GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("id").ToString());
-    Console.WriteLine(result.GetProperty("title").ToString());
-    Console.WriteLine(result.GetProperty("workflowRunId").ToString());
-    Console.WriteLine(result.GetProperty("workflowId").ToString());
-    Console.WriteLine(result.GetProperty("requestor").ToString());
-    Console.WriteLine(result.GetProperty("createdTime").ToString());
-    Console.WriteLine(result.GetProperty("lastUpdateTime").ToString());
-    Console.WriteLine(result.GetProperty("payload").GetProperty("type").ToString());
-    Console.WriteLine(result.GetProperty("payload").GetProperty("targetValue").ToString());
-    Console.WriteLine(result.GetProperty("payload").GetProperty("payload").ToString());
-    Console.WriteLine(result.GetProperty("reminderInfo").GetProperty("lastRemindTime").ToString());
-    Console.WriteLine(result.GetProperty("reminderInfo").GetProperty("nextRemindTime").ToString());
-    Console.WriteLine(result.GetProperty("reminderInfo").GetProperty("reminderSettings").ToString());
-    Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("lastExpiryNotificationTime").ToString());
-    Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("nextExpiryNotificationTime").ToString());
-    Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expiryTime").ToString());
-    Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("expireAfter").ToString());
-    Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("notifyOnExpiration")[0].ToString());
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("workflowRunId").ToString());
+    Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+    Console.WriteLine(result[0].GetProperty("requestor").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastUpdateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("payload").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("payload").GetProperty("targetValue").ToString());
 }
 ]]></code>
-</example>
+This sample shows how to call GetWorkflowTasks with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
+
+foreach (BinaryData item in client.GetWorkflowTasks("<viewMode>", new List<string>()
+{
+"<workflowIds>"
+}, "1d", 1234, "status desc", new List<string>()
+{
+"Approval"
+}, new List<string>()
+{
+"InProgress"
+}, "<workflowNameKeyword>", null))
+{
+    JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
+    Console.WriteLine(result[0].GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("id").ToString());
+    Console.WriteLine(result[0].GetProperty("title").ToString());
+    Console.WriteLine(result[0].GetProperty("workflowRunId").ToString());
+    Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+    Console.WriteLine(result[0].GetProperty("requestor").ToString());
+    Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+    Console.WriteLine(result[0].GetProperty("lastUpdateTime").ToString());
+    Console.WriteLine(result[0].GetProperty("payload").GetProperty("type").ToString());
+    Console.WriteLine(result[0].GetProperty("payload").GetProperty("targetValue").ToString());
+    Console.WriteLine(result[0].GetProperty("payload").GetProperty("payload").ToString());
+    Console.WriteLine(result[0].GetProperty("reminderInfo").GetProperty("lastRemindTime").ToString());
+    Console.WriteLine(result[0].GetProperty("reminderInfo").GetProperty("nextRemindTime").ToString());
+    Console.WriteLine(result[0].GetProperty("reminderInfo").GetProperty("reminderSettings").ToString());
+    Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("lastExpiryNotificationTime").ToString());
+    Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("nextExpiryNotificationTime").ToString());
+    Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("expiryTime").ToString());
+    Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("expireAfter").ToString());
+    Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("notifyOnExpiration")[0].ToString());
+}
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/purview/Azure.Analytics.Purview.Workflows/tests/Generated/Samples/Samples_PurviewWorkflowServiceClient.cs b/sdk/purview/Azure.Analytics.Purview.Workflows/tests/Generated/Samples/Samples_PurviewWorkflowServiceClient.cs
index eb68d48f0a04..c5f326df04b5 100644
--- a/sdk/purview/Azure.Analytics.Purview.Workflows/tests/Generated/Samples/Samples_PurviewWorkflowServiceClient.cs
+++ b/sdk/purview/Azure.Analytics.Purview.Workflows/tests/Generated/Samples/Samples_PurviewWorkflowServiceClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Purview.Workflows;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +23,11 @@ public class Samples_PurviewWorkflowServiceClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWorkflow()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = client.GetWorkflow(Guid.NewGuid(), new RequestContext());
+            Response response = client.GetWorkflow(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -42,11 +42,11 @@ public void Example_GetWorkflow()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWorkflow_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = client.GetWorkflow(Guid.NewGuid(), new RequestContext());
+            Response response = client.GetWorkflow(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -68,11 +68,11 @@ public void Example_GetWorkflow_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWorkflow_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = await client.GetWorkflowAsync(Guid.NewGuid(), new RequestContext());
+            Response response = await client.GetWorkflowAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -87,11 +87,11 @@ public async Task Example_GetWorkflow_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWorkflow_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = await client.GetWorkflowAsync(Guid.NewGuid(), new RequestContext());
+            Response response = await client.GetWorkflowAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -113,23 +113,24 @@ public async Task Example_GetWorkflow_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrReplaceWorkflow()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                triggers = new[] {
-        new {
-            type = "when_term_creation_is_requested",
-        }
-    },
-                name = "<name>",
-                isEnabled = true,
-                description = "<description>",
-            };
-
-            Response response = client.CreateOrReplaceWorkflow(Guid.NewGuid(), RequestContent.Create(data));
+                ["triggers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "when_term_creation_is_requested",
+}
+},
+                ["name"] = "<name>",
+                ["isEnabled"] = true,
+                ["description"] = "<description>",
+            });
+            Response response = client.CreateOrReplaceWorkflow(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -144,27 +145,28 @@ public void Example_CreateOrReplaceWorkflow()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateOrReplaceWorkflow_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                triggers = new[] {
-        new {
-            type = "when_term_creation_is_requested",
-            underGlossaryHierarchy = "<underGlossaryHierarchy>",
-            underCollection = "<underCollection>",
-            underGlossary = "<underGlossary>",
-        }
-    },
-                name = "<name>",
-                isEnabled = true,
-                description = "<description>",
-                actionDag = new { },
-            };
-
-            Response response = client.CreateOrReplaceWorkflow(Guid.NewGuid(), RequestContent.Create(data));
+                ["triggers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "when_term_creation_is_requested",
+["underGlossaryHierarchy"] = "<underGlossaryHierarchy>",
+["underCollection"] = "<underCollection>",
+["underGlossary"] = "<underGlossary>",
+}
+},
+                ["name"] = "<name>",
+                ["isEnabled"] = true,
+                ["description"] = "<description>",
+                ["actionDag"] = new Dictionary<string, object>(),
+            });
+            Response response = client.CreateOrReplaceWorkflow(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -186,23 +188,24 @@ public void Example_CreateOrReplaceWorkflow_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrReplaceWorkflow_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                triggers = new[] {
-        new {
-            type = "when_term_creation_is_requested",
-        }
-    },
-                name = "<name>",
-                isEnabled = true,
-                description = "<description>",
-            };
-
-            Response response = await client.CreateOrReplaceWorkflowAsync(Guid.NewGuid(), RequestContent.Create(data));
+                ["triggers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "when_term_creation_is_requested",
+}
+},
+                ["name"] = "<name>",
+                ["isEnabled"] = true,
+                ["description"] = "<description>",
+            });
+            Response response = await client.CreateOrReplaceWorkflowAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -217,27 +220,28 @@ public async Task Example_CreateOrReplaceWorkflow_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateOrReplaceWorkflow_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                triggers = new[] {
-        new {
-            type = "when_term_creation_is_requested",
-            underGlossaryHierarchy = "<underGlossaryHierarchy>",
-            underCollection = "<underCollection>",
-            underGlossary = "<underGlossary>",
-        }
-    },
-                name = "<name>",
-                isEnabled = true,
-                description = "<description>",
-                actionDag = new { },
-            };
-
-            Response response = await client.CreateOrReplaceWorkflowAsync(Guid.NewGuid(), RequestContent.Create(data));
+                ["triggers"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "when_term_creation_is_requested",
+["underGlossaryHierarchy"] = "<underGlossaryHierarchy>",
+["underCollection"] = "<underCollection>",
+["underGlossary"] = "<underGlossary>",
+}
+},
+                ["name"] = "<name>",
+                ["isEnabled"] = true,
+                ["description"] = "<description>",
+                ["actionDag"] = new Dictionary<string, object>(),
+            });
+            Response response = await client.CreateOrReplaceWorkflowAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -259,11 +263,11 @@ public async Task Example_CreateOrReplaceWorkflow_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteWorkflow()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = client.DeleteWorkflow(Guid.NewGuid());
+            Response response = client.DeleteWorkflow(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
             Console.WriteLine(response.Status);
         }
 
@@ -271,11 +275,11 @@ public void Example_DeleteWorkflow()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteWorkflow_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = client.DeleteWorkflow(Guid.NewGuid());
+            Response response = client.DeleteWorkflow(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
             Console.WriteLine(response.Status);
         }
 
@@ -283,11 +287,11 @@ public void Example_DeleteWorkflow_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteWorkflow_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = await client.DeleteWorkflowAsync(Guid.NewGuid());
+            Response response = await client.DeleteWorkflowAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
             Console.WriteLine(response.Status);
         }
 
@@ -295,11 +299,11 @@ public async Task Example_DeleteWorkflow_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteWorkflow_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = await client.DeleteWorkflowAsync(Guid.NewGuid());
+            Response response = await client.DeleteWorkflowAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"));
             Console.WriteLine(response.Status);
         }
 
@@ -307,21 +311,22 @@ public async Task Example_DeleteWorkflow_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_SubmitUserRequests()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                operations = new[] {
-        new {
-            type = "CreateTerm",
-            payload = new {},
-        }
-    },
-            };
-
-            Response response = client.SubmitUserRequests(RequestContent.Create(data));
+                ["operations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "CreateTerm",
+["payload"] = new Dictionary<string, object>(),
+}
+},
+            });
+            Response response = client.SubmitUserRequests(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("requestId").ToString());
@@ -335,22 +340,23 @@ public void Example_SubmitUserRequests()
         [Ignore("Only validating compilation of examples")]
         public void Example_SubmitUserRequests_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                operations = new[] {
-        new {
-            type = "CreateTerm",
-            payload = new {},
-        }
-    },
-                comment = "<comment>",
-            };
-
-            Response response = client.SubmitUserRequests(RequestContent.Create(data));
+                ["operations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "CreateTerm",
+["payload"] = new Dictionary<string, object>(),
+}
+},
+                ["comment"] = "<comment>",
+            });
+            Response response = client.SubmitUserRequests(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("requestId").ToString());
@@ -366,21 +372,22 @@ public void Example_SubmitUserRequests_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SubmitUserRequests_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                operations = new[] {
-        new {
-            type = "CreateTerm",
-            payload = new {},
-        }
-    },
-            };
-
-            Response response = await client.SubmitUserRequestsAsync(RequestContent.Create(data));
+                ["operations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "CreateTerm",
+["payload"] = new Dictionary<string, object>(),
+}
+},
+            });
+            Response response = await client.SubmitUserRequestsAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("requestId").ToString());
@@ -394,22 +401,23 @@ public async Task Example_SubmitUserRequests_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SubmitUserRequests_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                operations = new[] {
-        new {
-            type = "CreateTerm",
-            payload = new {},
-        }
-    },
-                comment = "<comment>",
-            };
-
-            Response response = await client.SubmitUserRequestsAsync(RequestContent.Create(data));
+                ["operations"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["type"] = "CreateTerm",
+["payload"] = new Dictionary<string, object>(),
+}
+},
+                ["comment"] = "<comment>",
+            });
+            Response response = await client.SubmitUserRequestsAsync(content);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("requestId").ToString());
@@ -425,11 +433,11 @@ public async Task Example_SubmitUserRequests_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWorkflowRun()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = client.GetWorkflowRun(Guid.NewGuid(), new RequestContext());
+            Response response = client.GetWorkflowRun(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -441,11 +449,11 @@ public void Example_GetWorkflowRun()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWorkflowRun_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = client.GetWorkflowRun(Guid.NewGuid(), new RequestContext());
+            Response response = client.GetWorkflowRun(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -469,11 +477,11 @@ public void Example_GetWorkflowRun_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWorkflowRun_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = await client.GetWorkflowRunAsync(Guid.NewGuid(), new RequestContext());
+            Response response = await client.GetWorkflowRunAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("actionDag").ToString());
@@ -485,11 +493,11 @@ public async Task Example_GetWorkflowRun_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWorkflowRun_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = await client.GetWorkflowRunAsync(Guid.NewGuid(), new RequestContext());
+            Response response = await client.GetWorkflowRunAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -513,13 +521,12 @@ public async Task Example_GetWorkflowRun_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CancelWorkflowRun()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = client.CancelWorkflowRun(Guid.NewGuid(), RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.CancelWorkflowRun(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -527,16 +534,15 @@ public void Example_CancelWorkflowRun()
         [Ignore("Only validating compilation of examples")]
         public void Example_CancelWorkflowRun_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                comment = "<comment>",
-            };
-
-            Response response = client.CancelWorkflowRun(Guid.NewGuid(), RequestContent.Create(data));
+                ["comment"] = "<comment>",
+            });
+            Response response = client.CancelWorkflowRun(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -544,13 +550,12 @@ public void Example_CancelWorkflowRun_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CancelWorkflowRun_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = await client.CancelWorkflowRunAsync(Guid.NewGuid(), RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.CancelWorkflowRunAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -558,16 +563,15 @@ public async Task Example_CancelWorkflowRun_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CancelWorkflowRun_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                comment = "<comment>",
-            };
-
-            Response response = await client.CancelWorkflowRunAsync(Guid.NewGuid(), RequestContent.Create(data));
+                ["comment"] = "<comment>",
+            });
+            Response response = await client.CancelWorkflowRunAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -575,11 +579,11 @@ public async Task Example_CancelWorkflowRun_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWorkflowTask()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = client.GetWorkflowTask(Guid.NewGuid(), new RequestContext());
+            Response response = client.GetWorkflowTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("type").ToString());
@@ -597,11 +601,11 @@ public void Example_GetWorkflowTask()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWorkflowTask_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = client.GetWorkflowTask(Guid.NewGuid(), new RequestContext());
+            Response response = client.GetWorkflowTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("type").ToString());
@@ -629,11 +633,11 @@ public void Example_GetWorkflowTask_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWorkflowTask_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = await client.GetWorkflowTaskAsync(Guid.NewGuid(), new RequestContext());
+            Response response = await client.GetWorkflowTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("type").ToString());
@@ -651,11 +655,11 @@ public async Task Example_GetWorkflowTask_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWorkflowTask_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = await client.GetWorkflowTaskAsync(Guid.NewGuid(), new RequestContext());
+            Response response = await client.GetWorkflowTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("type").ToString());
@@ -683,13 +687,12 @@ public async Task Example_GetWorkflowTask_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_ApproveApprovalTask()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = client.ApproveApprovalTask(Guid.NewGuid(), RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.ApproveApprovalTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -697,16 +700,15 @@ public void Example_ApproveApprovalTask()
         [Ignore("Only validating compilation of examples")]
         public void Example_ApproveApprovalTask_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                comment = "<comment>",
-            };
-
-            Response response = client.ApproveApprovalTask(Guid.NewGuid(), RequestContent.Create(data));
+                ["comment"] = "<comment>",
+            });
+            Response response = client.ApproveApprovalTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -714,13 +716,12 @@ public void Example_ApproveApprovalTask_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ApproveApprovalTask_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = await client.ApproveApprovalTaskAsync(Guid.NewGuid(), RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.ApproveApprovalTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -728,16 +729,15 @@ public async Task Example_ApproveApprovalTask_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ApproveApprovalTask_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                comment = "<comment>",
-            };
-
-            Response response = await client.ApproveApprovalTaskAsync(Guid.NewGuid(), RequestContent.Create(data));
+                ["comment"] = "<comment>",
+            });
+            Response response = await client.ApproveApprovalTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -745,13 +745,12 @@ public async Task Example_ApproveApprovalTask_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_RejectApprovalTask()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = client.RejectApprovalTask(Guid.NewGuid(), RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.RejectApprovalTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -759,16 +758,15 @@ public void Example_RejectApprovalTask()
         [Ignore("Only validating compilation of examples")]
         public void Example_RejectApprovalTask_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                comment = "<comment>",
-            };
-
-            Response response = client.RejectApprovalTask(Guid.NewGuid(), RequestContent.Create(data));
+                ["comment"] = "<comment>",
+            });
+            Response response = client.RejectApprovalTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -776,13 +774,12 @@ public void Example_RejectApprovalTask_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RejectApprovalTask_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = await client.RejectApprovalTaskAsync(Guid.NewGuid(), RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.RejectApprovalTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -790,16 +787,15 @@ public async Task Example_RejectApprovalTask_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RejectApprovalTask_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                comment = "<comment>",
-            };
-
-            Response response = await client.RejectApprovalTaskAsync(Guid.NewGuid(), RequestContent.Create(data));
+                ["comment"] = "<comment>",
+            });
+            Response response = await client.RejectApprovalTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -807,13 +803,12 @@ public async Task Example_RejectApprovalTask_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_ReassignWorkflowTask()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new { };
-
-            Response response = client.ReassignWorkflowTask(Guid.NewGuid(), RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = client.ReassignWorkflowTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -821,21 +816,22 @@ public void Example_ReassignWorkflowTask()
         [Ignore("Only validating compilation of examples")]
         public void Example_ReassignWorkflowTask_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                reassignments = new[] {
-        new {
-            reassignFrom = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-            reassignTo = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-        }
-    },
-            };
-
-            Response response = client.ReassignWorkflowTask(Guid.NewGuid(), RequestContent.Create(data));
+                ["reassignments"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["reassignFrom"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+["reassignTo"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+}
+},
+            });
+            Response response = client.ReassignWorkflowTask(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -843,13 +839,12 @@ public void Example_ReassignWorkflowTask_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ReassignWorkflowTask_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
-
-            var data = new { };
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            Response response = await client.ReassignWorkflowTaskAsync(Guid.NewGuid(), RequestContent.Create(data));
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>());
+            Response response = await client.ReassignWorkflowTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -857,21 +852,22 @@ public async Task Example_ReassignWorkflowTask_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_ReassignWorkflowTask_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                reassignments = new[] {
-        new {
-            reassignFrom = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-            reassignTo = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-        }
-    },
-            };
-
-            Response response = await client.ReassignWorkflowTaskAsync(Guid.NewGuid(), RequestContent.Create(data));
+                ["reassignments"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["reassignFrom"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+["reassignTo"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+}
+},
+            });
+            Response response = await client.ReassignWorkflowTaskAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -879,16 +875,15 @@ public async Task Example_ReassignWorkflowTask_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateTaskStatus()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                newStatus = "NotStarted",
-            };
-
-            Response response = client.UpdateTaskStatus(Guid.NewGuid(), RequestContent.Create(data));
+                ["newStatus"] = "NotStarted",
+            });
+            Response response = client.UpdateTaskStatus(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -896,17 +891,16 @@ public void Example_UpdateTaskStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_UpdateTaskStatus_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                newStatus = "NotStarted",
-                comment = "<comment>",
-            };
-
-            Response response = client.UpdateTaskStatus(Guid.NewGuid(), RequestContent.Create(data));
+                ["newStatus"] = "NotStarted",
+                ["comment"] = "<comment>",
+            });
+            Response response = client.UpdateTaskStatus(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -914,16 +908,15 @@ public void Example_UpdateTaskStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateTaskStatus_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                newStatus = "NotStarted",
-            };
-
-            Response response = await client.UpdateTaskStatusAsync(Guid.NewGuid(), RequestContent.Create(data));
+                ["newStatus"] = "NotStarted",
+            });
+            Response response = await client.UpdateTaskStatusAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -931,17 +924,16 @@ public async Task Example_UpdateTaskStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_UpdateTaskStatus_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                newStatus = "NotStarted",
-                comment = "<comment>",
-            };
-
-            Response response = await client.UpdateTaskStatusAsync(Guid.NewGuid(), RequestContent.Create(data));
+                ["newStatus"] = "NotStarted",
+                ["comment"] = "<comment>",
+            });
+            Response response = await client.UpdateTaskStatusAsync(Guid.Parse("73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"), content);
             Console.WriteLine(response.Status);
         }
 
@@ -949,18 +941,18 @@ public async Task Example_UpdateTaskStatus_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWorkflows()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetWorkflows(new RequestContext()))
+            foreach (BinaryData item in client.GetWorkflows(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("isEnabled").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("isEnabled").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
             }
         }
 
@@ -968,25 +960,25 @@ public void Example_GetWorkflows()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWorkflows_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetWorkflows(new RequestContext()))
+            foreach (BinaryData item in client.GetWorkflows(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("underGlossaryHierarchy").ToString());
-                Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("underCollection").ToString());
-                Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("underGlossary").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("lastUpdateTime").ToString());
-                Console.WriteLine(result.GetProperty("updatedBy").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("isEnabled").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("underGlossaryHierarchy").ToString());
+                Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("underCollection").ToString());
+                Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("underGlossary").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("lastUpdateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("updatedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("isEnabled").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
             }
         }
 
@@ -994,18 +986,18 @@ public void Example_GetWorkflows_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWorkflows_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetWorkflowsAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetWorkflowsAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("isEnabled").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("isEnabled").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
             }
         }
 
@@ -1013,25 +1005,25 @@ public async Task Example_GetWorkflows_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWorkflows_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetWorkflowsAsync(new RequestContext()))
+            await foreach (BinaryData item in client.GetWorkflowsAsync(null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("underGlossaryHierarchy").ToString());
-                Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("underCollection").ToString());
-                Console.WriteLine(result.GetProperty("triggers")[0].GetProperty("underGlossary").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("createdBy").ToString());
-                Console.WriteLine(result.GetProperty("lastUpdateTime").ToString());
-                Console.WriteLine(result.GetProperty("updatedBy").ToString());
-                Console.WriteLine(result.GetProperty("name").ToString());
-                Console.WriteLine(result.GetProperty("isEnabled").ToString());
-                Console.WriteLine(result.GetProperty("description").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("underGlossaryHierarchy").ToString());
+                Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("underCollection").ToString());
+                Console.WriteLine(result[0].GetProperty("triggers")[0].GetProperty("underGlossary").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("createdBy").ToString());
+                Console.WriteLine(result[0].GetProperty("lastUpdateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("updatedBy").ToString());
+                Console.WriteLine(result[0].GetProperty("name").ToString());
+                Console.WriteLine(result[0].GetProperty("isEnabled").ToString());
+                Console.WriteLine(result[0].GetProperty("description").ToString());
             }
         }
 
@@ -1039,20 +1031,20 @@ public async Task Example_GetWorkflows_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWorkflowRuns()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetWorkflowRuns("<timeWindow>", "<orderby>", new string[] { "<runStatuses>" }, new string[] { "<workflowIds>" }, 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetWorkflowRuns(null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("workflowId").ToString());
-                Console.WriteLine(result.GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("requestor").ToString());
-                Console.WriteLine(result.GetProperty("runPayload").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("runPayload").GetProperty("targetValue").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+                Console.WriteLine(result[0].GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("requestor").ToString());
+                Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("targetValue").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
             }
         }
 
@@ -1060,24 +1052,30 @@ public void Example_GetWorkflowRuns()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWorkflowRuns_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetWorkflowRuns("<timeWindow>", "<orderby>", new string[] { "<runStatuses>" }, new string[] { "<workflowIds>" }, 1234, new RequestContext()))
+            foreach (BinaryData item in client.GetWorkflowRuns("1d", "status desc", new List<string>()
+{
+"InProgress"
+}, new List<string>()
+{
+"<workflowIds>"
+}, 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("workflowId").ToString());
-                Console.WriteLine(result.GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("requestor").ToString());
-                Console.WriteLine(result.GetProperty("userRequestId").ToString());
-                Console.WriteLine(result.GetProperty("runPayload").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("runPayload").GetProperty("targetValue").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("endTime").ToString());
-                Console.WriteLine(result.GetProperty("cancelTime").ToString());
-                Console.WriteLine(result.GetProperty("cancelComment").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+                Console.WriteLine(result[0].GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("requestor").ToString());
+                Console.WriteLine(result[0].GetProperty("userRequestId").ToString());
+                Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("targetValue").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("endTime").ToString());
+                Console.WriteLine(result[0].GetProperty("cancelTime").ToString());
+                Console.WriteLine(result[0].GetProperty("cancelComment").ToString());
             }
         }
 
@@ -1085,20 +1083,20 @@ public void Example_GetWorkflowRuns_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWorkflowRuns_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetWorkflowRunsAsync("<timeWindow>", "<orderby>", new string[] { "<runStatuses>" }, new string[] { "<workflowIds>" }, 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetWorkflowRunsAsync(null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("workflowId").ToString());
-                Console.WriteLine(result.GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("requestor").ToString());
-                Console.WriteLine(result.GetProperty("runPayload").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("runPayload").GetProperty("targetValue").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+                Console.WriteLine(result[0].GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("requestor").ToString());
+                Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("targetValue").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
             }
         }
 
@@ -1106,24 +1104,30 @@ public async Task Example_GetWorkflowRuns_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWorkflowRuns_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetWorkflowRunsAsync("<timeWindow>", "<orderby>", new string[] { "<runStatuses>" }, new string[] { "<workflowIds>" }, 1234, new RequestContext()))
+            await foreach (BinaryData item in client.GetWorkflowRunsAsync("1d", "status desc", new List<string>()
+{
+"InProgress"
+}, new List<string>()
+{
+"<workflowIds>"
+}, 1234, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("workflowId").ToString());
-                Console.WriteLine(result.GetProperty("startTime").ToString());
-                Console.WriteLine(result.GetProperty("requestor").ToString());
-                Console.WriteLine(result.GetProperty("userRequestId").ToString());
-                Console.WriteLine(result.GetProperty("runPayload").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("runPayload").GetProperty("targetValue").ToString());
-                Console.WriteLine(result.GetProperty("status").ToString());
-                Console.WriteLine(result.GetProperty("endTime").ToString());
-                Console.WriteLine(result.GetProperty("cancelTime").ToString());
-                Console.WriteLine(result.GetProperty("cancelComment").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+                Console.WriteLine(result[0].GetProperty("startTime").ToString());
+                Console.WriteLine(result[0].GetProperty("requestor").ToString());
+                Console.WriteLine(result[0].GetProperty("userRequestId").ToString());
+                Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("runPayload").GetProperty("targetValue").ToString());
+                Console.WriteLine(result[0].GetProperty("status").ToString());
+                Console.WriteLine(result[0].GetProperty("endTime").ToString());
+                Console.WriteLine(result[0].GetProperty("cancelTime").ToString());
+                Console.WriteLine(result[0].GetProperty("cancelComment").ToString());
             }
         }
 
@@ -1131,22 +1135,22 @@ public async Task Example_GetWorkflowRuns_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWorkflowTasks()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetWorkflowTasks("<viewMode>", new string[] { "<workflowIds>" }, "<timeWindow>", 1234, "<orderby>", new string[] { "<taskTypes>" }, new string[] { "<taskStatuses>" }, "<workflowNameKeyword>", new RequestContext()))
+            foreach (BinaryData item in client.GetWorkflowTasks(null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("workflowRunId").ToString());
-                Console.WriteLine(result.GetProperty("workflowId").ToString());
-                Console.WriteLine(result.GetProperty("requestor").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("lastUpdateTime").ToString());
-                Console.WriteLine(result.GetProperty("payload").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("payload").GetProperty("targetValue").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("workflowRunId").ToString());
+                Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+                Console.WriteLine(result[0].GetProperty("requestor").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastUpdateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("payload").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("payload").GetProperty("targetValue").ToString());
             }
         }
 
@@ -1154,32 +1158,41 @@ public void Example_GetWorkflowTasks()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetWorkflowTasks_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            foreach (var item in client.GetWorkflowTasks("<viewMode>", new string[] { "<workflowIds>" }, "<timeWindow>", 1234, "<orderby>", new string[] { "<taskTypes>" }, new string[] { "<taskStatuses>" }, "<workflowNameKeyword>", new RequestContext()))
+            foreach (BinaryData item in client.GetWorkflowTasks("<viewMode>", new List<string>()
+{
+"<workflowIds>"
+}, "1d", 1234, "status desc", new List<string>()
+{
+"Approval"
+}, new List<string>()
+{
+"InProgress"
+}, "<workflowNameKeyword>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("title").ToString());
-                Console.WriteLine(result.GetProperty("workflowRunId").ToString());
-                Console.WriteLine(result.GetProperty("workflowId").ToString());
-                Console.WriteLine(result.GetProperty("requestor").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("lastUpdateTime").ToString());
-                Console.WriteLine(result.GetProperty("payload").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("payload").GetProperty("targetValue").ToString());
-                Console.WriteLine(result.GetProperty("payload").GetProperty("payload").ToString());
-                Console.WriteLine(result.GetProperty("reminderInfo").GetProperty("lastRemindTime").ToString());
-                Console.WriteLine(result.GetProperty("reminderInfo").GetProperty("nextRemindTime").ToString());
-                Console.WriteLine(result.GetProperty("reminderInfo").GetProperty("reminderSettings").ToString());
-                Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("lastExpiryNotificationTime").ToString());
-                Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("nextExpiryNotificationTime").ToString());
-                Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expiryTime").ToString());
-                Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("expireAfter").ToString());
-                Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("notifyOnExpiration")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("title").ToString());
+                Console.WriteLine(result[0].GetProperty("workflowRunId").ToString());
+                Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+                Console.WriteLine(result[0].GetProperty("requestor").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastUpdateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("payload").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("payload").GetProperty("targetValue").ToString());
+                Console.WriteLine(result[0].GetProperty("payload").GetProperty("payload").ToString());
+                Console.WriteLine(result[0].GetProperty("reminderInfo").GetProperty("lastRemindTime").ToString());
+                Console.WriteLine(result[0].GetProperty("reminderInfo").GetProperty("nextRemindTime").ToString());
+                Console.WriteLine(result[0].GetProperty("reminderInfo").GetProperty("reminderSettings").ToString());
+                Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("lastExpiryNotificationTime").ToString());
+                Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("nextExpiryNotificationTime").ToString());
+                Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("expiryTime").ToString());
+                Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("expireAfter").ToString());
+                Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("notifyOnExpiration")[0].ToString());
             }
         }
 
@@ -1187,22 +1200,22 @@ public void Example_GetWorkflowTasks_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWorkflowTasks_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetWorkflowTasksAsync("<viewMode>", new string[] { "<workflowIds>" }, "<timeWindow>", 1234, "<orderby>", new string[] { "<taskTypes>" }, new string[] { "<taskStatuses>" }, "<workflowNameKeyword>", new RequestContext()))
+            await foreach (BinaryData item in client.GetWorkflowTasksAsync(null, null, null, null, null, null, null, null, null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("workflowRunId").ToString());
-                Console.WriteLine(result.GetProperty("workflowId").ToString());
-                Console.WriteLine(result.GetProperty("requestor").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("lastUpdateTime").ToString());
-                Console.WriteLine(result.GetProperty("payload").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("payload").GetProperty("targetValue").ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("workflowRunId").ToString());
+                Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+                Console.WriteLine(result[0].GetProperty("requestor").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastUpdateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("payload").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("payload").GetProperty("targetValue").ToString());
             }
         }
 
@@ -1210,32 +1223,41 @@ public async Task Example_GetWorkflowTasks_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetWorkflowTasks_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new PurviewWorkflowServiceClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            PurviewWorkflowServiceClient client = new PurviewWorkflowServiceClient(endpoint, credential);
 
-            await foreach (var item in client.GetWorkflowTasksAsync("<viewMode>", new string[] { "<workflowIds>" }, "<timeWindow>", 1234, "<orderby>", new string[] { "<taskTypes>" }, new string[] { "<taskStatuses>" }, "<workflowNameKeyword>", new RequestContext()))
+            await foreach (BinaryData item in client.GetWorkflowTasksAsync("<viewMode>", new List<string>()
+{
+"<workflowIds>"
+}, "1d", 1234, "status desc", new List<string>()
+{
+"Approval"
+}, new List<string>()
+{
+"InProgress"
+}, "<workflowNameKeyword>", null))
             {
                 JsonElement result = JsonDocument.Parse(item.ToStream()).RootElement;
-                Console.WriteLine(result.GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("id").ToString());
-                Console.WriteLine(result.GetProperty("title").ToString());
-                Console.WriteLine(result.GetProperty("workflowRunId").ToString());
-                Console.WriteLine(result.GetProperty("workflowId").ToString());
-                Console.WriteLine(result.GetProperty("requestor").ToString());
-                Console.WriteLine(result.GetProperty("createdTime").ToString());
-                Console.WriteLine(result.GetProperty("lastUpdateTime").ToString());
-                Console.WriteLine(result.GetProperty("payload").GetProperty("type").ToString());
-                Console.WriteLine(result.GetProperty("payload").GetProperty("targetValue").ToString());
-                Console.WriteLine(result.GetProperty("payload").GetProperty("payload").ToString());
-                Console.WriteLine(result.GetProperty("reminderInfo").GetProperty("lastRemindTime").ToString());
-                Console.WriteLine(result.GetProperty("reminderInfo").GetProperty("nextRemindTime").ToString());
-                Console.WriteLine(result.GetProperty("reminderInfo").GetProperty("reminderSettings").ToString());
-                Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("lastExpiryNotificationTime").ToString());
-                Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("nextExpiryNotificationTime").ToString());
-                Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expiryTime").ToString());
-                Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("expireAfter").ToString());
-                Console.WriteLine(result.GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("notifyOnExpiration")[0].ToString());
+                Console.WriteLine(result[0].GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("id").ToString());
+                Console.WriteLine(result[0].GetProperty("title").ToString());
+                Console.WriteLine(result[0].GetProperty("workflowRunId").ToString());
+                Console.WriteLine(result[0].GetProperty("workflowId").ToString());
+                Console.WriteLine(result[0].GetProperty("requestor").ToString());
+                Console.WriteLine(result[0].GetProperty("createdTime").ToString());
+                Console.WriteLine(result[0].GetProperty("lastUpdateTime").ToString());
+                Console.WriteLine(result[0].GetProperty("payload").GetProperty("type").ToString());
+                Console.WriteLine(result[0].GetProperty("payload").GetProperty("targetValue").ToString());
+                Console.WriteLine(result[0].GetProperty("payload").GetProperty("payload").ToString());
+                Console.WriteLine(result[0].GetProperty("reminderInfo").GetProperty("lastRemindTime").ToString());
+                Console.WriteLine(result[0].GetProperty("reminderInfo").GetProperty("nextRemindTime").ToString());
+                Console.WriteLine(result[0].GetProperty("reminderInfo").GetProperty("reminderSettings").ToString());
+                Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("lastExpiryNotificationTime").ToString());
+                Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("nextExpiryNotificationTime").ToString());
+                Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("expiryTime").ToString());
+                Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("expireAfter").ToString());
+                Console.WriteLine(result[0].GetProperty("expiryInfo").GetProperty("expirySettings").GetProperty("notifyOnExpiration")[0].ToString());
             }
         }
     }
diff --git a/sdk/synapse/Azure.Analytics.Synapse.AccessControl/src/Generated/Docs/RoleAssignmentsClient.xml b/sdk/synapse/Azure.Analytics.Synapse.AccessControl/src/Generated/Docs/RoleAssignmentsClient.xml
index 323bedb0584c..f290b0497583 100644
--- a/sdk/synapse/Azure.Analytics.Synapse.AccessControl/src/Generated/Docs/RoleAssignmentsClient.xml
+++ b/sdk/synapse/Azure.Analytics.Synapse.AccessControl/src/Generated/Docs/RoleAssignmentsClient.xml
@@ -2,54 +2,61 @@
 <doc>
   <members>
     <member name="CheckPrincipalAccessAsync(RequestContent,ContentType,RequestContext)">
-<example>
-This sample shows how to call CheckPrincipalAccessAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CheckPrincipalAccessAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
-
-var data = new {
-    subject = new {
-        principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-    },
-    actions = new[] {
-        new {
-            id = "<id>",
-            isDataAction = true,
-        }
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["subject"] = new Dictionary<string, object>()
+    {
+        ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
     },
-    scope = "<scope>",
-};
-
-Response response = await client.CheckPrincipalAccessAsync(RequestContent.Create(data), ContentType.ApplicationOctetStream);
+    ["actions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["isDataAction"] = true,
+}
+},
+    ["scope"] = "<scope>",
+});
+Response response = await client.CheckPrincipalAccessAsync(content, new ContentType("application/json"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CheckPrincipalAccessAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CheckPrincipalAccessAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
-
-var data = new {
-    subject = new {
-        principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-        groupIds = new[] {
-            "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"
-        },
-    },
-    actions = new[] {
-        new {
-            id = "<id>",
-            isDataAction = true,
-        }
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["subject"] = new Dictionary<string, object>()
+    {
+        ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+        ["groupIds"] = new List<object>()
+{
+"73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"
+},
     },
-    scope = "<scope>",
-};
-
-Response response = await client.CheckPrincipalAccessAsync(RequestContent.Create(data), ContentType.ApplicationOctetStream);
+    ["actions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["isDataAction"] = true,
+}
+},
+    ["scope"] = "<scope>",
+});
+Response response = await client.CheckPrincipalAccessAsync(content, new ContentType("application/json"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("accessDecisions")[0].GetProperty("accessDecision").ToString());
@@ -59,58 +66,64 @@ Console.WriteLine(result.GetProperty("accessDecisions")[0].GetProperty("roleAssi
 Console.WriteLine(result.GetProperty("accessDecisions")[0].GetProperty("roleAssignment").GetProperty("principalId").ToString());
 Console.WriteLine(result.GetProperty("accessDecisions")[0].GetProperty("roleAssignment").GetProperty("scope").ToString());
 Console.WriteLine(result.GetProperty("accessDecisions")[0].GetProperty("roleAssignment").GetProperty("principalType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CheckPrincipalAccess(RequestContent,ContentType,RequestContext)">
-<example>
-This sample shows how to call CheckPrincipalAccess with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CheckPrincipalAccess and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
-
-var data = new {
-    subject = new {
-        principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["subject"] = new Dictionary<string, object>()
+    {
+        ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
     },
-    actions = new[] {
-        new {
-            id = "<id>",
-            isDataAction = true,
-        }
-    },
-    scope = "<scope>",
-};
-
-Response response = client.CheckPrincipalAccess(RequestContent.Create(data), ContentType.ApplicationOctetStream);
+    ["actions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["isDataAction"] = true,
+}
+},
+    ["scope"] = "<scope>",
+});
+Response response = client.CheckPrincipalAccess(content, new ContentType("application/json"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CheckPrincipalAccess with all parameters and request content, and how to parse the result.
+This sample shows how to call CheckPrincipalAccess with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
-
-var data = new {
-    subject = new {
-        principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-        groupIds = new[] {
-            "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"
-        },
-    },
-    actions = new[] {
-        new {
-            id = "<id>",
-            isDataAction = true,
-        }
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["subject"] = new Dictionary<string, object>()
+    {
+        ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+        ["groupIds"] = new List<object>()
+{
+"73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"
+},
     },
-    scope = "<scope>",
-};
-
-Response response = client.CheckPrincipalAccess(RequestContent.Create(data), ContentType.ApplicationOctetStream);
+    ["actions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["isDataAction"] = true,
+}
+},
+    ["scope"] = "<scope>",
+});
+Response response = client.CheckPrincipalAccess(content, new ContentType("application/json"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("accessDecisions")[0].GetProperty("accessDecision").ToString());
@@ -120,18 +133,28 @@ Console.WriteLine(result.GetProperty("accessDecisions")[0].GetProperty("roleAssi
 Console.WriteLine(result.GetProperty("accessDecisions")[0].GetProperty("roleAssignment").GetProperty("principalId").ToString());
 Console.WriteLine(result.GetProperty("accessDecisions")[0].GetProperty("roleAssignment").GetProperty("scope").ToString());
 Console.WriteLine(result.GetProperty("accessDecisions")[0].GetProperty("roleAssignment").GetProperty("principalType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRoleAssignmentsAsync(string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetRoleAssignmentsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRoleAssignmentsAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
+
+Response response = await client.GetRoleAssignmentsAsync(null, null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetRoleAssignmentsAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-Response response = await client.GetRoleAssignmentsAsync("<roleId>", "<principalId>", "<scope>", "<continuationToken>", new RequestContext());
+Response response = await client.GetRoleAssignmentsAsync("<roleId>", "<principalId>", "<scope>", "<continuationToken>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("count").ToString());
@@ -140,18 +163,28 @@ Console.WriteLine(result.GetProperty("value")[0].GetProperty("roleDefinitionId")
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("principalId").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("scope").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("principalType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRoleAssignments(string,string,string,string,RequestContext)">
-<example>
-This sample shows how to call GetRoleAssignments with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRoleAssignments and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-Response response = client.GetRoleAssignments("<roleId>", "<principalId>", "<scope>", "<continuationToken>", new RequestContext());
+Response response = client.GetRoleAssignments(null, null, null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetRoleAssignments with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
+
+Response response = client.GetRoleAssignments("<roleId>", "<principalId>", "<scope>", "<continuationToken>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("count").ToString());
@@ -160,42 +193,41 @@ Console.WriteLine(result.GetProperty("value")[0].GetProperty("roleDefinitionId")
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("principalId").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("scope").ToString());
 Console.WriteLine(result.GetProperty("value")[0].GetProperty("principalType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateRoleAssignmentAsync(string,RequestContent,ContentType,RequestContext)">
-<example>
-This sample shows how to call CreateRoleAssignmentAsync with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateRoleAssignmentAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
-
-var data = new {
-    roleId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-    principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-    scope = "<scope>",
-};
-
-Response response = await client.CreateRoleAssignmentAsync("<roleAssignmentId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["roleId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+    ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+    ["scope"] = "<scope>",
+});
+Response response = await client.CreateRoleAssignmentAsync("<roleAssignmentId>", content, new ContentType("application/json"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateRoleAssignmentAsync with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateRoleAssignmentAsync with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
-
-var data = new {
-    roleId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-    principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-    scope = "<scope>",
-    principalType = "<principalType>",
-};
-
-Response response = await client.CreateRoleAssignmentAsync("<roleAssignmentId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["roleId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+    ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+    ["scope"] = "<scope>",
+    ["principalType"] = "<principalType>",
+});
+Response response = await client.CreateRoleAssignmentAsync("<roleAssignmentId>", content, new ContentType("application/json"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -203,42 +235,41 @@ Console.WriteLine(result.GetProperty("roleDefinitionId").ToString());
 Console.WriteLine(result.GetProperty("principalId").ToString());
 Console.WriteLine(result.GetProperty("scope").ToString());
 Console.WriteLine(result.GetProperty("principalType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CreateRoleAssignment(string,RequestContent,ContentType,RequestContext)">
-<example>
-This sample shows how to call CreateRoleAssignment with required parameters and request content, and how to parse the result.
+      <example>
+This sample shows how to call CreateRoleAssignment and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
-
-var data = new {
-    roleId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-    principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-    scope = "<scope>",
-};
-
-Response response = client.CreateRoleAssignment("<roleAssignmentId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["roleId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+    ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+    ["scope"] = "<scope>",
+});
+Response response = client.CreateRoleAssignment("<roleAssignmentId>", content, new ContentType("application/json"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.ToString());
 ]]></code>
-This sample shows how to call CreateRoleAssignment with all parameters and request content, and how to parse the result.
+This sample shows how to call CreateRoleAssignment with all parameters and request content and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
-
-var data = new {
-    roleId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-    principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-    scope = "<scope>",
-    principalType = "<principalType>",
-};
-
-Response response = client.CreateRoleAssignment("<roleAssignmentId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
+
+RequestContent content = RequestContent.Create(new Dictionary<string, object>()
+{
+    ["roleId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+    ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+    ["scope"] = "<scope>",
+    ["principalType"] = "<principalType>",
+});
+Response response = client.CreateRoleAssignment("<roleAssignmentId>", content, new ContentType("application/json"));
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -246,18 +277,28 @@ Console.WriteLine(result.GetProperty("roleDefinitionId").ToString());
 Console.WriteLine(result.GetProperty("principalId").ToString());
 Console.WriteLine(result.GetProperty("scope").ToString());
 Console.WriteLine(result.GetProperty("principalType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRoleAssignmentByIdAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetRoleAssignmentByIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRoleAssignmentByIdAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
+
+Response response = await client.GetRoleAssignmentByIdAsync("<roleAssignmentId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetRoleAssignmentByIdAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-Response response = await client.GetRoleAssignmentByIdAsync("<roleAssignmentId>", new RequestContext());
+Response response = await client.GetRoleAssignmentByIdAsync("<roleAssignmentId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -265,18 +306,28 @@ Console.WriteLine(result.GetProperty("roleDefinitionId").ToString());
 Console.WriteLine(result.GetProperty("principalId").ToString());
 Console.WriteLine(result.GetProperty("scope").ToString());
 Console.WriteLine(result.GetProperty("principalType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRoleAssignmentById(string,RequestContext)">
-<example>
-This sample shows how to call GetRoleAssignmentById with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRoleAssignmentById and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-Response response = client.GetRoleAssignmentById("<roleAssignmentId>", new RequestContext());
+Response response = client.GetRoleAssignmentById("<roleAssignmentId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetRoleAssignmentById with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
+
+Response response = client.GetRoleAssignmentById("<roleAssignmentId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -284,52 +335,49 @@ Console.WriteLine(result.GetProperty("roleDefinitionId").ToString());
 Console.WriteLine(result.GetProperty("principalId").ToString());
 Console.WriteLine(result.GetProperty("scope").ToString());
 Console.WriteLine(result.GetProperty("principalType").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteRoleAssignmentByIdAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteRoleAssignmentByIdAsync with required parameters.
+      <example>
+This sample shows how to call DeleteRoleAssignmentByIdAsync.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
 Response response = await client.DeleteRoleAssignmentByIdAsync("<roleAssignmentId>");
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call DeleteRoleAssignmentByIdAsync with all parameters.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-Response response = await client.DeleteRoleAssignmentByIdAsync("<roleAssignmentId>", "<scope>");
+Response response = await client.DeleteRoleAssignmentByIdAsync("<roleAssignmentId>", scope: "<scope>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="DeleteRoleAssignmentById(string,string,RequestContext)">
-<example>
-This sample shows how to call DeleteRoleAssignmentById with required parameters.
+      <example>
+This sample shows how to call DeleteRoleAssignmentById.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
 Response response = client.DeleteRoleAssignmentById("<roleAssignmentId>");
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call DeleteRoleAssignmentById with all parameters.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleAssignmentsClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-Response response = client.DeleteRoleAssignmentById("<roleAssignmentId>", "<scope>");
+Response response = client.DeleteRoleAssignmentById("<roleAssignmentId>", scope: "<scope>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/synapse/Azure.Analytics.Synapse.AccessControl/src/Generated/Docs/RoleDefinitionsClient.xml b/sdk/synapse/Azure.Analytics.Synapse.AccessControl/src/Generated/Docs/RoleDefinitionsClient.xml
index 8d05ef0472fd..b93236f6efec 100644
--- a/sdk/synapse/Azure.Analytics.Synapse.AccessControl/src/Generated/Docs/RoleDefinitionsClient.xml
+++ b/sdk/synapse/Azure.Analytics.Synapse.AccessControl/src/Generated/Docs/RoleDefinitionsClient.xml
@@ -2,14 +2,25 @@
 <doc>
   <members>
     <member name="GetRoleDefinitionsAsync(bool?,string,RequestContext)">
-<example>
-This sample shows how to call GetRoleDefinitionsAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRoleDefinitionsAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleDefinitionsClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-Response response = await client.GetRoleDefinitionsAsync(true, "<scope>", new RequestContext());
+Response response = await client.GetRoleDefinitionsAsync(null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetRoleDefinitionsAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
+
+Response response = await client.GetRoleDefinitionsAsync(true, "<scope>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("id").ToString());
@@ -22,18 +33,28 @@ Console.WriteLine(result[0].GetProperty("permissions")[0].GetProperty("dataActio
 Console.WriteLine(result[0].GetProperty("permissions")[0].GetProperty("notDataActions")[0].ToString());
 Console.WriteLine(result[0].GetProperty("scopes")[0].ToString());
 Console.WriteLine(result[0].GetProperty("availabilityStatus").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRoleDefinitions(bool?,string,RequestContext)">
-<example>
-This sample shows how to call GetRoleDefinitions with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRoleDefinitions and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
+
+Response response = client.GetRoleDefinitions(null, null, null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code>
+This sample shows how to call GetRoleDefinitions with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleDefinitionsClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-Response response = client.GetRoleDefinitions(true, "<scope>", new RequestContext());
+Response response = client.GetRoleDefinitions(true, "<scope>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].GetProperty("id").ToString());
@@ -46,18 +67,28 @@ Console.WriteLine(result[0].GetProperty("permissions")[0].GetProperty("dataActio
 Console.WriteLine(result[0].GetProperty("permissions")[0].GetProperty("notDataActions")[0].ToString());
 Console.WriteLine(result[0].GetProperty("scopes")[0].ToString());
 Console.WriteLine(result[0].GetProperty("availabilityStatus").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRoleDefinitionByIdAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetRoleDefinitionByIdAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRoleDefinitionByIdAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
+
+Response response = await client.GetRoleDefinitionByIdAsync("<roleDefinitionId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetRoleDefinitionByIdAsync with all parameters and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleDefinitionsClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-Response response = await client.GetRoleDefinitionByIdAsync("<roleDefinitionId>", new RequestContext());
+Response response = await client.GetRoleDefinitionByIdAsync("<roleDefinitionId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -70,18 +101,28 @@ Console.WriteLine(result.GetProperty("permissions")[0].GetProperty("dataActions"
 Console.WriteLine(result.GetProperty("permissions")[0].GetProperty("notDataActions")[0].ToString());
 Console.WriteLine(result.GetProperty("scopes")[0].ToString());
 Console.WriteLine(result.GetProperty("availabilityStatus").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetRoleDefinitionById(string,RequestContext)">
-<example>
-This sample shows how to call GetRoleDefinitionById with required parameters and parse the result.
+      <example>
+This sample shows how to call GetRoleDefinitionById and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleDefinitionsClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-Response response = client.GetRoleDefinitionById("<roleDefinitionId>", new RequestContext());
+Response response = client.GetRoleDefinitionById("<roleDefinitionId>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetRoleDefinitionById with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
+
+Response response = client.GetRoleDefinitionById("<roleDefinitionId>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("id").ToString());
@@ -94,38 +135,57 @@ Console.WriteLine(result.GetProperty("permissions")[0].GetProperty("dataActions"
 Console.WriteLine(result.GetProperty("permissions")[0].GetProperty("notDataActions")[0].ToString());
 Console.WriteLine(result.GetProperty("scopes")[0].ToString());
 Console.WriteLine(result.GetProperty("availabilityStatus").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetScopesAsync(RequestContext)">
-<example>
-This sample shows how to call GetScopesAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetScopesAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleDefinitionsClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-Response response = await client.GetScopesAsync(new RequestContext());
+Response response = await client.GetScopesAsync(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].ToString());
 ]]></code>
-</example>
+This sample shows how to call GetScopesAsync with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
+
+Response response = await client.GetScopesAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code></example>
     </member>
     <member name="GetScopes(RequestContext)">
-<example>
-This sample shows how to call GetScopes with required parameters and parse the result.
+      <example>
+This sample shows how to call GetScopes and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var endpoint = new Uri("<https://my-service.azure.com>");
-var client = new RoleDefinitionsClient(endpoint, credential);
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-Response response = client.GetScopes(new RequestContext());
+Response response = client.GetScopes(null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result[0].ToString());
 ]]></code>
-</example>
+This sample shows how to call GetScopes with all parameters and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+TokenCredential credential = new DefaultAzureCredential();
+RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
+
+Response response = client.GetScopes(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result[0].ToString());
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/synapse/Azure.Analytics.Synapse.AccessControl/tests/Generated/Samples/Samples_RoleAssignmentsClient.cs b/sdk/synapse/Azure.Analytics.Synapse.AccessControl/tests/Generated/Samples/Samples_RoleAssignmentsClient.cs
index 8c412cb0440d..5663381e36cc 100644
--- a/sdk/synapse/Azure.Analytics.Synapse.AccessControl/tests/Generated/Samples/Samples_RoleAssignmentsClient.cs
+++ b/sdk/synapse/Azure.Analytics.Synapse.AccessControl/tests/Generated/Samples/Samples_RoleAssignmentsClient.cs
@@ -7,10 +7,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Synapse.AccessControl;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,26 +23,27 @@ public class Samples_RoleAssignmentsClient
         [Ignore("Only validating compilation of examples")]
         public void Example_CheckPrincipalAccess()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                subject = new
+                ["subject"] = new Dictionary<string, object>()
                 {
-                    principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                    ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
                 },
-                actions = new[] {
-        new {
-            id = "<id>",
-            isDataAction = true,
-        }
-    },
-                scope = "<scope>",
-            };
-
-            Response response = client.CheckPrincipalAccess(RequestContent.Create(data), ContentType.ApplicationOctetStream);
+                ["actions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["isDataAction"] = true,
+}
+},
+                ["scope"] = "<scope>",
+            });
+            Response response = client.CheckPrincipalAccess(content, new ContentType("application/json"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -52,29 +53,31 @@ public void Example_CheckPrincipalAccess()
         [Ignore("Only validating compilation of examples")]
         public void Example_CheckPrincipalAccess_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                subject = new
+                ["subject"] = new Dictionary<string, object>()
                 {
-                    principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-                    groupIds = new[] {
-            "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"
-        },
+                    ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                    ["groupIds"] = new List<object>()
+{
+"73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"
+},
                 },
-                actions = new[] {
-        new {
-            id = "<id>",
-            isDataAction = true,
-        }
-    },
-                scope = "<scope>",
-            };
-
-            Response response = client.CheckPrincipalAccess(RequestContent.Create(data), ContentType.ApplicationOctetStream);
+                ["actions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["isDataAction"] = true,
+}
+},
+                ["scope"] = "<scope>",
+            });
+            Response response = client.CheckPrincipalAccess(content, new ContentType("application/json"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("accessDecisions")[0].GetProperty("accessDecision").ToString());
@@ -90,26 +93,27 @@ public void Example_CheckPrincipalAccess_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CheckPrincipalAccess_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                subject = new
+                ["subject"] = new Dictionary<string, object>()
                 {
-                    principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                    ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
                 },
-                actions = new[] {
-        new {
-            id = "<id>",
-            isDataAction = true,
-        }
-    },
-                scope = "<scope>",
-            };
-
-            Response response = await client.CheckPrincipalAccessAsync(RequestContent.Create(data), ContentType.ApplicationOctetStream);
+                ["actions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["isDataAction"] = true,
+}
+},
+                ["scope"] = "<scope>",
+            });
+            Response response = await client.CheckPrincipalAccessAsync(content, new ContentType("application/json"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -119,29 +123,31 @@ public async Task Example_CheckPrincipalAccess_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CheckPrincipalAccess_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                subject = new
+                ["subject"] = new Dictionary<string, object>()
                 {
-                    principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-                    groupIds = new[] {
-            "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"
-        },
+                    ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                    ["groupIds"] = new List<object>()
+{
+"73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a"
+},
                 },
-                actions = new[] {
-        new {
-            id = "<id>",
-            isDataAction = true,
-        }
-    },
-                scope = "<scope>",
-            };
-
-            Response response = await client.CheckPrincipalAccessAsync(RequestContent.Create(data), ContentType.ApplicationOctetStream);
+                ["actions"] = new List<object>()
+{
+new Dictionary<string, object>()
+{
+["id"] = "<id>",
+["isDataAction"] = true,
+}
+},
+                ["scope"] = "<scope>",
+            });
+            Response response = await client.CheckPrincipalAccessAsync(content, new ContentType("application/json"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("accessDecisions")[0].GetProperty("accessDecision").ToString());
@@ -157,11 +163,11 @@ public async Task Example_CheckPrincipalAccess_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRoleAssignments()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            Response response = client.GetRoleAssignments("<roleId>", "<principalId>", "<scope>", "<continuationToken>", new RequestContext());
+            Response response = client.GetRoleAssignments(null, null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -171,11 +177,11 @@ public void Example_GetRoleAssignments()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRoleAssignments_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            Response response = client.GetRoleAssignments("<roleId>", "<principalId>", "<scope>", "<continuationToken>", new RequestContext());
+            Response response = client.GetRoleAssignments("<roleId>", "<principalId>", "<scope>", "<continuationToken>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("count").ToString());
@@ -190,11 +196,11 @@ public void Example_GetRoleAssignments_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRoleAssignments_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            Response response = await client.GetRoleAssignmentsAsync("<roleId>", "<principalId>", "<scope>", "<continuationToken>", new RequestContext());
+            Response response = await client.GetRoleAssignmentsAsync(null, null, null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -204,11 +210,11 @@ public async Task Example_GetRoleAssignments_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRoleAssignments_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            Response response = await client.GetRoleAssignmentsAsync("<roleId>", "<principalId>", "<scope>", "<continuationToken>", new RequestContext());
+            Response response = await client.GetRoleAssignmentsAsync("<roleId>", "<principalId>", "<scope>", "<continuationToken>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("count").ToString());
@@ -223,18 +229,17 @@ public async Task Example_GetRoleAssignments_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateRoleAssignment()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                roleId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-                principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-                scope = "<scope>",
-            };
-
-            Response response = client.CreateRoleAssignment("<roleAssignmentId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+                ["roleId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                ["scope"] = "<scope>",
+            });
+            Response response = client.CreateRoleAssignment("<roleAssignmentId>", content, new ContentType("application/json"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -244,19 +249,18 @@ public void Example_CreateRoleAssignment()
         [Ignore("Only validating compilation of examples")]
         public void Example_CreateRoleAssignment_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                roleId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-                principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-                scope = "<scope>",
-                principalType = "<principalType>",
-            };
-
-            Response response = client.CreateRoleAssignment("<roleAssignmentId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+                ["roleId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                ["scope"] = "<scope>",
+                ["principalType"] = "<principalType>",
+            });
+            Response response = client.CreateRoleAssignment("<roleAssignmentId>", content, new ContentType("application/json"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -270,18 +274,17 @@ public void Example_CreateRoleAssignment_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateRoleAssignment_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                roleId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-                principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-                scope = "<scope>",
-            };
-
-            Response response = await client.CreateRoleAssignmentAsync("<roleAssignmentId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+                ["roleId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                ["scope"] = "<scope>",
+            });
+            Response response = await client.CreateRoleAssignmentAsync("<roleAssignmentId>", content, new ContentType("application/json"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -291,19 +294,18 @@ public async Task Example_CreateRoleAssignment_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CreateRoleAssignment_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            var data = new
+            RequestContent content = RequestContent.Create(new Dictionary<string, object>()
             {
-                roleId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-                principalId = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
-                scope = "<scope>",
-                principalType = "<principalType>",
-            };
-
-            Response response = await client.CreateRoleAssignmentAsync("<roleAssignmentId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+                ["roleId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                ["principalId"] = "73f411fe-4f43-4b4b-9cbd-6828d8f4cf9a",
+                ["scope"] = "<scope>",
+                ["principalType"] = "<principalType>",
+            });
+            Response response = await client.CreateRoleAssignmentAsync("<roleAssignmentId>", content, new ContentType("application/json"));
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -317,11 +319,11 @@ public async Task Example_CreateRoleAssignment_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRoleAssignmentById()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            Response response = client.GetRoleAssignmentById("<roleAssignmentId>", new RequestContext());
+            Response response = client.GetRoleAssignmentById("<roleAssignmentId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -331,11 +333,11 @@ public void Example_GetRoleAssignmentById()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRoleAssignmentById_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            Response response = client.GetRoleAssignmentById("<roleAssignmentId>", new RequestContext());
+            Response response = client.GetRoleAssignmentById("<roleAssignmentId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -349,11 +351,11 @@ public void Example_GetRoleAssignmentById_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRoleAssignmentById_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            Response response = await client.GetRoleAssignmentByIdAsync("<roleAssignmentId>", new RequestContext());
+            Response response = await client.GetRoleAssignmentByIdAsync("<roleAssignmentId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -363,11 +365,11 @@ public async Task Example_GetRoleAssignmentById_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRoleAssignmentById_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            Response response = await client.GetRoleAssignmentByIdAsync("<roleAssignmentId>", new RequestContext());
+            Response response = await client.GetRoleAssignmentByIdAsync("<roleAssignmentId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -381,9 +383,9 @@ public async Task Example_GetRoleAssignmentById_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteRoleAssignmentById()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
             Response response = client.DeleteRoleAssignmentById("<roleAssignmentId>");
             Console.WriteLine(response.Status);
@@ -393,11 +395,11 @@ public void Example_DeleteRoleAssignmentById()
         [Ignore("Only validating compilation of examples")]
         public void Example_DeleteRoleAssignmentById_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            Response response = client.DeleteRoleAssignmentById("<roleAssignmentId>", "<scope>");
+            Response response = client.DeleteRoleAssignmentById("<roleAssignmentId>", scope: "<scope>");
             Console.WriteLine(response.Status);
         }
 
@@ -405,9 +407,9 @@ public void Example_DeleteRoleAssignmentById_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteRoleAssignmentById_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
             Response response = await client.DeleteRoleAssignmentByIdAsync("<roleAssignmentId>");
             Console.WriteLine(response.Status);
@@ -417,11 +419,11 @@ public async Task Example_DeleteRoleAssignmentById_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_DeleteRoleAssignmentById_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleAssignmentsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleAssignmentsClient client = new RoleAssignmentsClient(endpoint, credential);
 
-            Response response = await client.DeleteRoleAssignmentByIdAsync("<roleAssignmentId>", "<scope>");
+            Response response = await client.DeleteRoleAssignmentByIdAsync("<roleAssignmentId>", scope: "<scope>");
             Console.WriteLine(response.Status);
         }
     }
diff --git a/sdk/synapse/Azure.Analytics.Synapse.AccessControl/tests/Generated/Samples/Samples_RoleDefinitionsClient.cs b/sdk/synapse/Azure.Analytics.Synapse.AccessControl/tests/Generated/Samples/Samples_RoleDefinitionsClient.cs
index 31503049e96b..f550432d1626 100644
--- a/sdk/synapse/Azure.Analytics.Synapse.AccessControl/tests/Generated/Samples/Samples_RoleDefinitionsClient.cs
+++ b/sdk/synapse/Azure.Analytics.Synapse.AccessControl/tests/Generated/Samples/Samples_RoleDefinitionsClient.cs
@@ -6,11 +6,10 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
+using Azure.Analytics.Synapse.AccessControl;
 using Azure.Core;
 using Azure.Identity;
 using NUnit.Framework;
@@ -23,11 +22,11 @@ public class Samples_RoleDefinitionsClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRoleDefinitions()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleDefinitionsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-            Response response = client.GetRoleDefinitions(true, "<scope>", new RequestContext());
+            Response response = client.GetRoleDefinitions(null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -37,11 +36,11 @@ public void Example_GetRoleDefinitions()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRoleDefinitions_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleDefinitionsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-            Response response = client.GetRoleDefinitions(true, "<scope>", new RequestContext());
+            Response response = client.GetRoleDefinitions(true, "<scope>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("id").ToString());
@@ -60,11 +59,11 @@ public void Example_GetRoleDefinitions_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRoleDefinitions_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleDefinitionsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-            Response response = await client.GetRoleDefinitionsAsync(true, "<scope>", new RequestContext());
+            Response response = await client.GetRoleDefinitionsAsync(null, null, null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -74,11 +73,11 @@ public async Task Example_GetRoleDefinitions_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRoleDefinitions_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleDefinitionsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-            Response response = await client.GetRoleDefinitionsAsync(true, "<scope>", new RequestContext());
+            Response response = await client.GetRoleDefinitionsAsync(true, "<scope>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].GetProperty("id").ToString());
@@ -97,11 +96,11 @@ public async Task Example_GetRoleDefinitions_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRoleDefinitionById()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleDefinitionsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-            Response response = client.GetRoleDefinitionById("<roleDefinitionId>", new RequestContext());
+            Response response = client.GetRoleDefinitionById("<roleDefinitionId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -111,11 +110,11 @@ public void Example_GetRoleDefinitionById()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetRoleDefinitionById_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleDefinitionsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-            Response response = client.GetRoleDefinitionById("<roleDefinitionId>", new RequestContext());
+            Response response = client.GetRoleDefinitionById("<roleDefinitionId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -134,11 +133,11 @@ public void Example_GetRoleDefinitionById_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRoleDefinitionById_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleDefinitionsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-            Response response = await client.GetRoleDefinitionByIdAsync("<roleDefinitionId>", new RequestContext());
+            Response response = await client.GetRoleDefinitionByIdAsync("<roleDefinitionId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -148,11 +147,11 @@ public async Task Example_GetRoleDefinitionById_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetRoleDefinitionById_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleDefinitionsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-            Response response = await client.GetRoleDefinitionByIdAsync("<roleDefinitionId>", new RequestContext());
+            Response response = await client.GetRoleDefinitionByIdAsync("<roleDefinitionId>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("id").ToString());
@@ -171,11 +170,11 @@ public async Task Example_GetRoleDefinitionById_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetScopes()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleDefinitionsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-            Response response = client.GetScopes(new RequestContext());
+            Response response = client.GetScopes(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -185,11 +184,11 @@ public void Example_GetScopes()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetScopes_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleDefinitionsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-            Response response = client.GetScopes(new RequestContext());
+            Response response = client.GetScopes(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -199,11 +198,11 @@ public void Example_GetScopes_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetScopes_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleDefinitionsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-            Response response = await client.GetScopesAsync(new RequestContext());
+            Response response = await client.GetScopesAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
@@ -213,11 +212,11 @@ public async Task Example_GetScopes_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetScopes_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var endpoint = new Uri("<https://my-service.azure.com>");
-            var client = new RoleDefinitionsClient(endpoint, credential);
+            Uri endpoint = new Uri("<endpoint>");
+            TokenCredential credential = new DefaultAzureCredential();
+            RoleDefinitionsClient client = new RoleDefinitionsClient(endpoint, credential);
 
-            Response response = await client.GetScopesAsync(new RequestContext());
+            Response response = await client.GetScopesAsync(null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result[0].ToString());
diff --git a/sdk/template/Azure.Template/src/Generated/Docs/TemplateClient.xml b/sdk/template/Azure.Template/src/Generated/Docs/TemplateClient.xml
index 493ff8f5e819..2afce19619dd 100644
--- a/sdk/template/Azure.Template/src/Generated/Docs/TemplateClient.xml
+++ b/sdk/template/Azure.Template/src/Generated/Docs/TemplateClient.xml
@@ -2,42 +2,60 @@
 <doc>
   <members>
     <member name="GetSecretAsync(string,RequestContext)">
-<example>
-This sample shows how to call GetSecretAsync with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSecretAsync and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new TemplateClient("<vaultBaseUrl>", credential);
+TokenCredential credential = new DefaultAzureCredential();
+TemplateClient client = new TemplateClient("<VaultBaseUrl>", credential);
 
-Response response = await client.GetSecretAsync("<secretName>", new RequestContext());
+Response response = await client.GetSecretAsync("<secretName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSecretAsync with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+TemplateClient client = new TemplateClient("<VaultBaseUrl>", credential);
+
+Response response = await client.GetSecretAsync("<secretName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("contentType").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("kid").ToString());
 Console.WriteLine(result.GetProperty("managed").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="GetSecret(string,RequestContext)">
-<example>
-This sample shows how to call GetSecret with required parameters and parse the result.
+      <example>
+This sample shows how to call GetSecret and parse the result.
 <code><![CDATA[
-var credential = new DefaultAzureCredential();
-var client = new TemplateClient("<vaultBaseUrl>", credential);
+TokenCredential credential = new DefaultAzureCredential();
+TemplateClient client = new TemplateClient("<VaultBaseUrl>", credential);
 
-Response response = client.GetSecret("<secretName>", new RequestContext());
+Response response = client.GetSecret("<secretName>", null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.ToString());
+]]></code>
+This sample shows how to call GetSecret with all parameters and parse the result.
+<code><![CDATA[
+TokenCredential credential = new DefaultAzureCredential();
+TemplateClient client = new TemplateClient("<VaultBaseUrl>", credential);
+
+Response response = client.GetSecret("<secretName>", null);
 
 JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
 Console.WriteLine(result.GetProperty("value").ToString());
 Console.WriteLine(result.GetProperty("id").ToString());
 Console.WriteLine(result.GetProperty("contentType").ToString());
-Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
 Console.WriteLine(result.GetProperty("kid").ToString());
 Console.WriteLine(result.GetProperty("managed").ToString());
-]]></code>
-</example>
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/template/Azure.Template/tests/Generated/Samples/Samples_TemplateClient.cs b/sdk/template/Azure.Template/tests/Generated/Samples/Samples_TemplateClient.cs
index 6131f8c3ac56..2c96437e6b68 100644
--- a/sdk/template/Azure.Template/tests/Generated/Samples/Samples_TemplateClient.cs
+++ b/sdk/template/Azure.Template/tests/Generated/Samples/Samples_TemplateClient.cs
@@ -6,13 +6,12 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Template;
 using NUnit.Framework;
 
 namespace Azure.Template.Samples
@@ -23,10 +22,10 @@ public class Samples_TemplateClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSecret()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new TemplateClient("<vaultBaseUrl>", credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            TemplateClient client = new TemplateClient("<VaultBaseUrl>", credential);
 
-            Response response = client.GetSecret("<secretName>", new RequestContext());
+            Response response = client.GetSecret("<secretName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -36,16 +35,16 @@ public void Example_GetSecret()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetSecret_AllParameters()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new TemplateClient("<vaultBaseUrl>", credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            TemplateClient client = new TemplateClient("<VaultBaseUrl>", credential);
 
-            Response response = client.GetSecret("<secretName>", new RequestContext());
+            Response response = client.GetSecret("<secretName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("contentType").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("kid").ToString());
             Console.WriteLine(result.GetProperty("managed").ToString());
         }
@@ -54,10 +53,10 @@ public void Example_GetSecret_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSecret_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new TemplateClient("<vaultBaseUrl>", credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            TemplateClient client = new TemplateClient("<VaultBaseUrl>", credential);
 
-            Response response = await client.GetSecretAsync("<secretName>", new RequestContext());
+            Response response = await client.GetSecretAsync("<secretName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.ToString());
@@ -67,16 +66,16 @@ public async Task Example_GetSecret_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetSecret_AllParameters_Async()
         {
-            var credential = new DefaultAzureCredential();
-            var client = new TemplateClient("<vaultBaseUrl>", credential);
+            TokenCredential credential = new DefaultAzureCredential();
+            TemplateClient client = new TemplateClient("<VaultBaseUrl>", credential);
 
-            Response response = await client.GetSecretAsync("<secretName>", new RequestContext());
+            Response response = await client.GetSecretAsync("<secretName>", null);
 
             JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
             Console.WriteLine(result.GetProperty("value").ToString());
             Console.WriteLine(result.GetProperty("id").ToString());
             Console.WriteLine(result.GetProperty("contentType").ToString());
-            Console.WriteLine(result.GetProperty("tags").GetProperty("<test>").ToString());
+            Console.WriteLine(result.GetProperty("tags").GetProperty("<key>").ToString());
             Console.WriteLine(result.GetProperty("kid").ToString());
             Console.WriteLine(result.GetProperty("managed").ToString());
         }
diff --git a/sdk/translation/Azure.AI.Translation.Text/src/Generated/Docs/TextTranslationClient.xml b/sdk/translation/Azure.AI.Translation.Text/src/Generated/Docs/TextTranslationClient.xml
index 08e6614e77a9..d3307a69df70 100644
--- a/sdk/translation/Azure.AI.Translation.Text/src/Generated/Docs/TextTranslationClient.xml
+++ b/sdk/translation/Azure.AI.Translation.Text/src/Generated/Docs/TextTranslationClient.xml
@@ -1,53 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <doc>
   <members>
-    <member name="GetLanguagesAsync(string,string,string,string,CancellationToken)">
-    </member>
-    <member name="GetLanguages(string,string,string,string,CancellationToken)">
-    </member>
-    <member name="GetLanguagesAsync(string,string,string,ETag?,RequestContext)">
-    </member>
-    <member name="GetLanguages(string,string,string,ETag?,RequestContext)">
-    </member>
-    <member name="TranslateAsync(IEnumerable{string},IEnumerable{InputTextItem},string,string,string,string,string,string,bool?,bool?,string,string,string,bool?,CancellationToken)">
-    </member>
-    <member name="Translate(IEnumerable{string},IEnumerable{InputTextItem},string,string,string,string,string,string,bool?,bool?,string,string,string,bool?,CancellationToken)">
-    </member>
-    <member name="TranslateAsync(IEnumerable{string},RequestContent,string,string,string,string,string,string,bool?,bool?,string,string,string,bool?,RequestContext)">
-    </member>
-    <member name="Translate(IEnumerable{string},RequestContent,string,string,string,string,string,string,bool?,bool?,string,string,string,bool?,RequestContext)">
-    </member>
-    <member name="TransliterateAsync(string,string,string,IEnumerable{InputTextItem},string,CancellationToken)">
-    </member>
-    <member name="Transliterate(string,string,string,IEnumerable{InputTextItem},string,CancellationToken)">
-    </member>
-    <member name="TransliterateAsync(string,string,string,RequestContent,string,RequestContext)">
-    </member>
-    <member name="Transliterate(string,string,string,RequestContent,string,RequestContext)">
-    </member>
-    <member name="FindSentenceBoundariesAsync(IEnumerable{InputTextItem},string,string,string,CancellationToken)">
-    </member>
-    <member name="FindSentenceBoundaries(IEnumerable{InputTextItem},string,string,string,CancellationToken)">
-    </member>
-    <member name="FindSentenceBoundariesAsync(RequestContent,string,string,string,RequestContext)">
-    </member>
-    <member name="FindSentenceBoundaries(RequestContent,string,string,string,RequestContext)">
-    </member>
-    <member name="LookupDictionaryEntriesAsync(string,string,IEnumerable{InputTextItem},string,CancellationToken)">
-    </member>
-    <member name="LookupDictionaryEntries(string,string,IEnumerable{InputTextItem},string,CancellationToken)">
-    </member>
-    <member name="LookupDictionaryEntriesAsync(string,string,RequestContent,string,RequestContext)">
-    </member>
-    <member name="LookupDictionaryEntries(string,string,RequestContent,string,RequestContext)">
-    </member>
-    <member name="LookupDictionaryExamplesAsync(string,string,IEnumerable{DictionaryExampleTextItem},string,CancellationToken)">
-    </member>
-    <member name="LookupDictionaryExamples(string,string,IEnumerable{DictionaryExampleTextItem},string,CancellationToken)">
-    </member>
-    <member name="LookupDictionaryExamplesAsync(string,string,RequestContent,string,RequestContext)">
-    </member>
-    <member name="LookupDictionaryExamples(string,string,RequestContent,string,RequestContext)">
-    </member>
+    <member name="GetLanguagesAsync(string,string,string,string,CancellationToken)" />
+    <member name="GetLanguages(string,string,string,string,CancellationToken)" />
+    <member name="GetLanguagesAsync(string,string,string,ETag?,RequestContext)" />
+    <member name="GetLanguages(string,string,string,ETag?,RequestContext)" />
+    <member name="TranslateAsync(IEnumerable{string},IEnumerable{InputTextItem},string,string,string,string,string,string,bool?,bool?,string,string,string,bool?,CancellationToken)" />
+    <member name="Translate(IEnumerable{string},IEnumerable{InputTextItem},string,string,string,string,string,string,bool?,bool?,string,string,string,bool?,CancellationToken)" />
+    <member name="TranslateAsync(IEnumerable{string},RequestContent,string,string,string,string,string,string,bool?,bool?,string,string,string,bool?,RequestContext)" />
+    <member name="Translate(IEnumerable{string},RequestContent,string,string,string,string,string,string,bool?,bool?,string,string,string,bool?,RequestContext)" />
+    <member name="TransliterateAsync(string,string,string,IEnumerable{InputTextItem},string,CancellationToken)" />
+    <member name="Transliterate(string,string,string,IEnumerable{InputTextItem},string,CancellationToken)" />
+    <member name="TransliterateAsync(string,string,string,RequestContent,string,RequestContext)" />
+    <member name="Transliterate(string,string,string,RequestContent,string,RequestContext)" />
+    <member name="FindSentenceBoundariesAsync(IEnumerable{InputTextItem},string,string,string,CancellationToken)" />
+    <member name="FindSentenceBoundaries(IEnumerable{InputTextItem},string,string,string,CancellationToken)" />
+    <member name="FindSentenceBoundariesAsync(RequestContent,string,string,string,RequestContext)" />
+    <member name="FindSentenceBoundaries(RequestContent,string,string,string,RequestContext)" />
+    <member name="LookupDictionaryEntriesAsync(string,string,IEnumerable{InputTextItem},string,CancellationToken)" />
+    <member name="LookupDictionaryEntries(string,string,IEnumerable{InputTextItem},string,CancellationToken)" />
+    <member name="LookupDictionaryEntriesAsync(string,string,RequestContent,string,RequestContext)" />
+    <member name="LookupDictionaryEntries(string,string,RequestContent,string,RequestContext)" />
+    <member name="LookupDictionaryExamplesAsync(string,string,IEnumerable{DictionaryExampleTextItem},string,CancellationToken)" />
+    <member name="LookupDictionaryExamples(string,string,IEnumerable{DictionaryExampleTextItem},string,CancellationToken)" />
+    <member name="LookupDictionaryExamplesAsync(string,string,RequestContent,string,RequestContext)" />
+    <member name="LookupDictionaryExamples(string,string,RequestContent,string,RequestContext)" />
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/translation/Azure.AI.Translation.Text/tests/Generated/Samples/Samples_TextTranslationClient.cs b/sdk/translation/Azure.AI.Translation.Text/tests/Generated/Samples/Samples_TextTranslationClient.cs
index 403084b6e93d..597827a76267 100644
--- a/sdk/translation/Azure.AI.Translation.Text/tests/Generated/Samples/Samples_TextTranslationClient.cs
+++ b/sdk/translation/Azure.AI.Translation.Text/tests/Generated/Samples/Samples_TextTranslationClient.cs
@@ -5,12 +5,6 @@
 
 #nullable disable
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
-using Azure;
-using Azure.Core;
 using Azure.Identity;
 
 namespace Azure.AI.Translation.Text.Samples
diff --git a/sdk/webpubsub/Azure.Messaging.WebPubSub/src/Generated/Docs/HealthApiClient.xml b/sdk/webpubsub/Azure.Messaging.WebPubSub/src/Generated/Docs/HealthApiClient.xml
index 7cfbd124a805..a043accb8f24 100644
--- a/sdk/webpubsub/Azure.Messaging.WebPubSub/src/Generated/Docs/HealthApiClient.xml
+++ b/sdk/webpubsub/Azure.Messaging.WebPubSub/src/Generated/Docs/HealthApiClient.xml
@@ -2,26 +2,38 @@
 <doc>
   <members>
     <member name="GetServiceStatusAsync(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetServiceStatusAsync.
 <code><![CDATA[
-var client = new HealthApiClient("<https://my-service.azure.com>");
+HealthApiClient client = new HealthApiClient("<Endpoint>");
 
 Response response = await client.GetServiceStatusAsync();
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call GetServiceStatusAsync with all request content.
+<code><![CDATA[
+HealthApiClient client = new HealthApiClient("<Endpoint>");
+
+Response response = await client.GetServiceStatusAsync();
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="GetServiceStatus(RequestContext)">
-<example>
+      <example>
 This sample shows how to call GetServiceStatus.
 <code><![CDATA[
-var client = new HealthApiClient("<https://my-service.azure.com>");
+HealthApiClient client = new HealthApiClient("<Endpoint>");
 
 Response response = client.GetServiceStatus();
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call GetServiceStatus with all request content.
+<code><![CDATA[
+HealthApiClient client = new HealthApiClient("<Endpoint>");
+
+Response response = client.GetServiceStatus();
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/webpubsub/Azure.Messaging.WebPubSub/src/Generated/Docs/WebPubSubServiceClient.xml b/sdk/webpubsub/Azure.Messaging.WebPubSub/src/Generated/Docs/WebPubSubServiceClient.xml
index fb481e3e8639..d0930c203b58 100644
--- a/sdk/webpubsub/Azure.Messaging.WebPubSub/src/Generated/Docs/WebPubSubServiceClient.xml
+++ b/sdk/webpubsub/Azure.Messaging.WebPubSub/src/Generated/Docs/WebPubSubServiceClient.xml
@@ -2,430 +2,476 @@
 <doc>
   <members>
     <member name="CloseAllConnectionsAsync(IEnumerable{string},string,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CloseAllConnectionsAsync.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = await client.CloseAllConnectionsAsync();
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call CloseAllConnectionsAsync with all parameters.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = await client.CloseAllConnectionsAsync(new String[]{"<excluded>"}, "<reason>");
+Response response = await client.CloseAllConnectionsAsync(excluded: new List<string>()
+{
+"<excluded>"
+}, reason: "<reason>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CloseAllConnections(IEnumerable{string},string,RequestContext)">
-<example>
+      <example>
 This sample shows how to call CloseAllConnections.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = client.CloseAllConnections();
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call CloseAllConnections with all parameters.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = client.CloseAllConnections(new String[]{"<excluded>"}, "<reason>");
+Response response = client.CloseAllConnections(excluded: new List<string>()
+{
+"<excluded>"
+}, reason: "<reason>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
-    </member>
-    <member name="GenerateClientTokenImplAsync(string,IEnumerable{string},int?,IEnumerable{string},RequestContext)">
-    </member>
-    <member name="GenerateClientTokenImpl(string,IEnumerable{string},int?,IEnumerable{string},RequestContext)">
+]]></code></example>
     </member>
+    <member name="GenerateClientTokenImplAsync(string,IEnumerable{string},int?,IEnumerable{string},RequestContext)" />
+    <member name="GenerateClientTokenImpl(string,IEnumerable{string},int?,IEnumerable{string},RequestContext)" />
     <member name="SendToAllAsync(RequestContent,ContentType,IEnumerable{string},string,RequestContext)">
-<example>
-This sample shows how to call SendToAllAsync with required parameters and request content.
+      <example>
+This sample shows how to call SendToAllAsync.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-var data = File.OpenRead("<filePath>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = await client.SendToAllAsync(RequestContent.Create(data), ContentType.ApplicationOctetStream);
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = await client.SendToAllAsync(content, new ContentType("application/json"));
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call SendToAllAsync with all parameters and request content.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-var data = File.OpenRead("<filePath>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = await client.SendToAllAsync(RequestContent.Create(data), ContentType.ApplicationOctetStream, new String[]{"<excluded>"}, "<filter>");
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = await client.SendToAllAsync(content, new ContentType("application/json"), excluded: new List<string>()
+{
+"<excluded>"
+}, filter: "<filter>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="SendToAll(RequestContent,ContentType,IEnumerable{string},string,RequestContext)">
-<example>
-This sample shows how to call SendToAll with required parameters and request content.
+      <example>
+This sample shows how to call SendToAll.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-var data = File.OpenRead("<filePath>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = client.SendToAll(RequestContent.Create(data), ContentType.ApplicationOctetStream);
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = client.SendToAll(content, new ContentType("application/json"));
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call SendToAll with all parameters and request content.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-var data = File.OpenRead("<filePath>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = client.SendToAll(RequestContent.Create(data), ContentType.ApplicationOctetStream, new String[]{"<excluded>"}, "<filter>");
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = client.SendToAll(content, new ContentType("application/json"), excluded: new List<string>()
+{
+"<excluded>"
+}, filter: "<filter>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CloseConnectionAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call CloseConnectionAsync with required parameters.
+      <example>
+This sample shows how to call CloseConnectionAsync.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = await client.CloseConnectionAsync("<connectionId>");
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call CloseConnectionAsync with all parameters.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = await client.CloseConnectionAsync("<connectionId>", "<reason>");
+Response response = await client.CloseConnectionAsync("<connectionId>", reason: "<reason>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CloseConnection(string,string,RequestContext)">
-<example>
-This sample shows how to call CloseConnection with required parameters.
+      <example>
+This sample shows how to call CloseConnection.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = client.CloseConnection("<connectionId>");
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call CloseConnection with all parameters.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = client.CloseConnection("<connectionId>", "<reason>");
+Response response = client.CloseConnection("<connectionId>", reason: "<reason>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
-    </member>
-    <member name="ConnectionExistsImplAsync(string,RequestContext)">
-    </member>
-    <member name="ConnectionExistsImpl(string,RequestContext)">
+]]></code></example>
     </member>
+    <member name="ConnectionExistsImplAsync(string,RequestContext)" />
+    <member name="ConnectionExistsImpl(string,RequestContext)" />
     <member name="SendToConnectionAsync(string,RequestContent,ContentType,RequestContext)">
-<example>
-This sample shows how to call SendToConnectionAsync with required parameters and request content.
+      <example>
+This sample shows how to call SendToConnectionAsync.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-var data = File.OpenRead("<filePath>");
-
-Response response = await client.SendToConnectionAsync("<connectionId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = await client.SendToConnectionAsync("<connectionId>", content, new ContentType("application/json"));
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call SendToConnectionAsync with all parameters and request content.
+<code><![CDATA[
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
+
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = await client.SendToConnectionAsync("<connectionId>", content, new ContentType("application/json"));
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="SendToConnection(string,RequestContent,ContentType,RequestContext)">
-<example>
-This sample shows how to call SendToConnection with required parameters and request content.
+      <example>
+This sample shows how to call SendToConnection.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-var data = File.OpenRead("<filePath>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = client.SendToConnection("<connectionId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = client.SendToConnection("<connectionId>", content, new ContentType("application/json"));
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call SendToConnection with all parameters and request content.
+<code><![CDATA[
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
+
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = client.SendToConnection("<connectionId>", content, new ContentType("application/json"));
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="RemoveConnectionFromAllGroupsAsync(string,RequestContext)">
-<example>
-This sample shows how to call RemoveConnectionFromAllGroupsAsync with required parameters.
+      <example>
+This sample shows how to call RemoveConnectionFromAllGroupsAsync.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = await client.RemoveConnectionFromAllGroupsAsync("<connectionId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call RemoveConnectionFromAllGroupsAsync with all parameters.
+<code><![CDATA[
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
+
+Response response = await client.RemoveConnectionFromAllGroupsAsync("<connectionId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="RemoveConnectionFromAllGroups(string,RequestContext)">
-<example>
-This sample shows how to call RemoveConnectionFromAllGroups with required parameters.
+      <example>
+This sample shows how to call RemoveConnectionFromAllGroups.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = client.RemoveConnectionFromAllGroups("<connectionId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
-    </member>
-    <member name="GroupExistsImplAsync(string,RequestContext)">
-    </member>
-    <member name="GroupExistsImpl(string,RequestContext)">
+This sample shows how to call RemoveConnectionFromAllGroups with all parameters.
+<code><![CDATA[
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
+
+Response response = client.RemoveConnectionFromAllGroups("<connectionId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
+    <member name="GroupExistsImplAsync(string,RequestContext)" />
+    <member name="GroupExistsImpl(string,RequestContext)" />
     <member name="CloseGroupConnectionsAsync(string,IEnumerable{string},string,RequestContext)">
-<example>
-This sample shows how to call CloseGroupConnectionsAsync with required parameters.
+      <example>
+This sample shows how to call CloseGroupConnectionsAsync.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = await client.CloseGroupConnectionsAsync("<group>");
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call CloseGroupConnectionsAsync with all parameters.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = await client.CloseGroupConnectionsAsync("<group>", new String[]{"<excluded>"}, "<reason>");
+Response response = await client.CloseGroupConnectionsAsync("<group>", excluded: new List<string>()
+{
+"<excluded>"
+}, reason: "<reason>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CloseGroupConnections(string,IEnumerable{string},string,RequestContext)">
-<example>
-This sample shows how to call CloseGroupConnections with required parameters.
+      <example>
+This sample shows how to call CloseGroupConnections.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = client.CloseGroupConnections("<group>");
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call CloseGroupConnections with all parameters.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = client.CloseGroupConnections("<group>", new String[]{"<excluded>"}, "<reason>");
+Response response = client.CloseGroupConnections("<group>", excluded: new List<string>()
+{
+"<excluded>"
+}, reason: "<reason>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="SendToGroupAsync(string,RequestContent,ContentType,IEnumerable{string},string,RequestContext)">
-<example>
-This sample shows how to call SendToGroupAsync with required parameters and request content.
+      <example>
+This sample shows how to call SendToGroupAsync.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-var data = File.OpenRead("<filePath>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = await client.SendToGroupAsync("<group>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = await client.SendToGroupAsync("<group>", content, new ContentType("application/json"));
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call SendToGroupAsync with all parameters and request content.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-var data = File.OpenRead("<filePath>");
-
-Response response = await client.SendToGroupAsync("<group>", RequestContent.Create(data), ContentType.ApplicationOctetStream, new String[]{"<excluded>"}, "<filter>");
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = await client.SendToGroupAsync("<group>", content, new ContentType("application/json"), excluded: new List<string>()
+{
+"<excluded>"
+}, filter: "<filter>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="SendToGroup(string,RequestContent,ContentType,IEnumerable{string},string,RequestContext)">
-<example>
-This sample shows how to call SendToGroup with required parameters and request content.
+      <example>
+This sample shows how to call SendToGroup.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-var data = File.OpenRead("<filePath>");
-
-Response response = client.SendToGroup("<group>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = client.SendToGroup("<group>", content, new ContentType("application/json"));
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call SendToGroup with all parameters and request content.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-var data = File.OpenRead("<filePath>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = client.SendToGroup("<group>", RequestContent.Create(data), ContentType.ApplicationOctetStream, new String[]{"<excluded>"}, "<filter>");
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = client.SendToGroup("<group>", content, new ContentType("application/json"), excluded: new List<string>()
+{
+"<excluded>"
+}, filter: "<filter>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RemoveConnectionFromGroupAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call RemoveConnectionFromGroupAsync with required parameters.
+      <example>
+This sample shows how to call RemoveConnectionFromGroupAsync.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = await client.RemoveConnectionFromGroupAsync("<group>", "<connectionId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call RemoveConnectionFromGroupAsync with all parameters.
+<code><![CDATA[
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
+
+Response response = await client.RemoveConnectionFromGroupAsync("<group>", "<connectionId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="RemoveConnectionFromGroup(string,string,RequestContext)">
-<example>
-This sample shows how to call RemoveConnectionFromGroup with required parameters.
+      <example>
+This sample shows how to call RemoveConnectionFromGroup.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = client.RemoveConnectionFromGroup("<group>", "<connectionId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call RemoveConnectionFromGroup with all parameters.
+<code><![CDATA[
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
+
+Response response = client.RemoveConnectionFromGroup("<group>", "<connectionId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="AddConnectionToGroupAsync(string,string,RequestContext)">
-<example>
-This sample shows how to call AddConnectionToGroupAsync with required parameters.
+      <example>
+This sample shows how to call AddConnectionToGroupAsync.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = await client.AddConnectionToGroupAsync("<group>", "<connectionId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call AddConnectionToGroupAsync with all parameters.
+<code><![CDATA[
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
+
+Response response = await client.AddConnectionToGroupAsync("<group>", "<connectionId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="AddConnectionToGroup(string,string,RequestContext)">
-<example>
-This sample shows how to call AddConnectionToGroup with required parameters.
+      <example>
+This sample shows how to call AddConnectionToGroup.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = client.AddConnectionToGroup("<group>", "<connectionId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
-    </member>
-    <member name="RevokePermissionAsync(string,string,string,RequestContext)">
-    </member>
-    <member name="RevokePermission(string,string,string,RequestContext)">
-    </member>
-    <member name="CheckPermissionAsync(string,string,string,RequestContext)">
-    </member>
-    <member name="CheckPermission(string,string,string,RequestContext)">
-    </member>
-    <member name="GrantPermissionAsync(string,string,string,RequestContext)">
-    </member>
-    <member name="GrantPermission(string,string,string,RequestContext)">
-    </member>
-    <member name="UserExistsImplAsync(string,RequestContext)">
-    </member>
-    <member name="UserExistsImpl(string,RequestContext)">
+This sample shows how to call AddConnectionToGroup with all parameters.
+<code><![CDATA[
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
+
+Response response = client.AddConnectionToGroup("<group>", "<connectionId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
+    <member name="RevokePermissionAsync(string,string,string,RequestContext)" />
+    <member name="RevokePermission(string,string,string,RequestContext)" />
+    <member name="CheckPermissionAsync(string,string,string,RequestContext)" />
+    <member name="CheckPermission(string,string,string,RequestContext)" />
+    <member name="GrantPermissionAsync(string,string,string,RequestContext)" />
+    <member name="GrantPermission(string,string,string,RequestContext)" />
+    <member name="UserExistsImplAsync(string,RequestContext)" />
+    <member name="UserExistsImpl(string,RequestContext)" />
     <member name="CloseUserConnectionsAsync(string,IEnumerable{string},string,RequestContext)">
-<example>
-This sample shows how to call CloseUserConnectionsAsync with required parameters.
+      <example>
+This sample shows how to call CloseUserConnectionsAsync.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = await client.CloseUserConnectionsAsync("<userId>");
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call CloseUserConnectionsAsync with all parameters.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = await client.CloseUserConnectionsAsync("<userId>", new String[]{"<excluded>"}, "<reason>");
+Response response = await client.CloseUserConnectionsAsync("<userId>", excluded: new List<string>()
+{
+"<excluded>"
+}, reason: "<reason>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="CloseUserConnections(string,IEnumerable{string},string,RequestContext)">
-<example>
-This sample shows how to call CloseUserConnections with required parameters.
+      <example>
+This sample shows how to call CloseUserConnections.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = client.CloseUserConnections("<userId>");
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call CloseUserConnections with all parameters.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = client.CloseUserConnections("<userId>", new String[]{"<excluded>"}, "<reason>");
+Response response = client.CloseUserConnections("<userId>", excluded: new List<string>()
+{
+"<excluded>"
+}, reason: "<reason>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="SendToUserAsync(string,RequestContent,ContentType,string,RequestContext)">
-<example>
-This sample shows how to call SendToUserAsync with required parameters and request content.
+      <example>
+This sample shows how to call SendToUserAsync.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-var data = File.OpenRead("<filePath>");
-
-Response response = await client.SendToUserAsync("<userId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = await client.SendToUserAsync("<userId>", content, new ContentType("application/json"));
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call SendToUserAsync with all parameters and request content.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-var data = File.OpenRead("<filePath>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = await client.SendToUserAsync("<userId>", RequestContent.Create(data), ContentType.ApplicationOctetStream, "<filter>");
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = await client.SendToUserAsync("<userId>", content, new ContentType("application/json"), filter: "<filter>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="SendToUser(string,RequestContent,ContentType,string,RequestContext)">
-<example>
-This sample shows how to call SendToUser with required parameters and request content.
+      <example>
+This sample shows how to call SendToUser.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-var data = File.OpenRead("<filePath>");
-
-Response response = client.SendToUser("<userId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = client.SendToUser("<userId>", content, new ContentType("application/json"));
 Console.WriteLine(response.Status);
 ]]></code>
 This sample shows how to call SendToUser with all parameters and request content.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-var data = File.OpenRead("<filePath>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-Response response = client.SendToUser("<userId>", RequestContent.Create(data), ContentType.ApplicationOctetStream, "<filter>");
+RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+Response response = client.SendToUser("<userId>", content, new ContentType("application/json"), filter: "<filter>");
 Console.WriteLine(response.Status);
-]]></code>
-</example>
+]]></code></example>
     </member>
     <member name="RemoveUserFromAllGroupsAsync(string,RequestContext)">
-<example>
-This sample shows how to call RemoveUserFromAllGroupsAsync with required parameters.
+      <example>
+This sample shows how to call RemoveUserFromAllGroupsAsync.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = await client.RemoveUserFromAllGroupsAsync("<userId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
+This sample shows how to call RemoveUserFromAllGroupsAsync with all parameters.
+<code><![CDATA[
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
+
+Response response = await client.RemoveUserFromAllGroupsAsync("<userId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
     <member name="RemoveUserFromAllGroups(string,RequestContext)">
-<example>
-This sample shows how to call RemoveUserFromAllGroups with required parameters.
+      <example>
+This sample shows how to call RemoveUserFromAllGroups.
 <code><![CDATA[
-var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
 Response response = client.RemoveUserFromAllGroups("<userId>");
 Console.WriteLine(response.Status);
 ]]></code>
-</example>
-    </member>
-    <member name="RemoveUserFromGroupAsync(string,string,RequestContext)">
-    </member>
-    <member name="RemoveUserFromGroup(string,string,RequestContext)">
-    </member>
-    <member name="AddUserToGroupAsync(string,string,RequestContext)">
-    </member>
-    <member name="AddUserToGroup(string,string,RequestContext)">
+This sample shows how to call RemoveUserFromAllGroups with all parameters.
+<code><![CDATA[
+WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
+
+Response response = client.RemoveUserFromAllGroups("<userId>");
+Console.WriteLine(response.Status);
+]]></code></example>
     </member>
+    <member name="RemoveUserFromGroupAsync(string,string,RequestContext)" />
+    <member name="RemoveUserFromGroup(string,string,RequestContext)" />
+    <member name="AddUserToGroupAsync(string,string,RequestContext)" />
+    <member name="AddUserToGroup(string,string,RequestContext)" />
   </members>
 </doc>
\ No newline at end of file
diff --git a/sdk/webpubsub/Azure.Messaging.WebPubSub/tests/Generated/Samples/Samples_HealthApiClient.cs b/sdk/webpubsub/Azure.Messaging.WebPubSub/tests/Generated/Samples/Samples_HealthApiClient.cs
index 5076471ac164..f14a14d41ea9 100644
--- a/sdk/webpubsub/Azure.Messaging.WebPubSub/tests/Generated/Samples/Samples_HealthApiClient.cs
+++ b/sdk/webpubsub/Azure.Messaging.WebPubSub/tests/Generated/Samples/Samples_HealthApiClient.cs
@@ -6,13 +6,10 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
-using Azure.Core;
 using Azure.Identity;
+using Azure.Messaging.WebPubSub;
 using NUnit.Framework;
 
 namespace Azure.Messaging.WebPubSub.Samples
@@ -23,7 +20,7 @@ public class Samples_HealthApiClient
         [Ignore("Only validating compilation of examples")]
         public void Example_GetServiceStatus()
         {
-            var client = new HealthApiClient("<https://my-service.azure.com>");
+            HealthApiClient client = new HealthApiClient("<Endpoint>");
 
             Response response = client.GetServiceStatus();
             Console.WriteLine(response.Status);
@@ -33,7 +30,7 @@ public void Example_GetServiceStatus()
         [Ignore("Only validating compilation of examples")]
         public void Example_GetServiceStatus_AllParameters()
         {
-            var client = new HealthApiClient("<https://my-service.azure.com>");
+            HealthApiClient client = new HealthApiClient("<Endpoint>");
 
             Response response = client.GetServiceStatus();
             Console.WriteLine(response.Status);
@@ -43,7 +40,7 @@ public void Example_GetServiceStatus_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetServiceStatus_Async()
         {
-            var client = new HealthApiClient("<https://my-service.azure.com>");
+            HealthApiClient client = new HealthApiClient("<Endpoint>");
 
             Response response = await client.GetServiceStatusAsync();
             Console.WriteLine(response.Status);
@@ -53,7 +50,7 @@ public async Task Example_GetServiceStatus_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_GetServiceStatus_AllParameters_Async()
         {
-            var client = new HealthApiClient("<https://my-service.azure.com>");
+            HealthApiClient client = new HealthApiClient("<Endpoint>");
 
             Response response = await client.GetServiceStatusAsync();
             Console.WriteLine(response.Status);
diff --git a/sdk/webpubsub/Azure.Messaging.WebPubSub/tests/Generated/Samples/Samples_WebPubSubServiceClient.cs b/sdk/webpubsub/Azure.Messaging.WebPubSub/tests/Generated/Samples/Samples_WebPubSubServiceClient.cs
index af906aa9b4f8..3ddce40b6d4d 100644
--- a/sdk/webpubsub/Azure.Messaging.WebPubSub/tests/Generated/Samples/Samples_WebPubSubServiceClient.cs
+++ b/sdk/webpubsub/Azure.Messaging.WebPubSub/tests/Generated/Samples/Samples_WebPubSubServiceClient.cs
@@ -8,11 +8,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text.Json;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Core;
 using Azure.Identity;
+using Azure.Messaging.WebPubSub;
 using NUnit.Framework;
 
 namespace Azure.Messaging.WebPubSub.Samples
@@ -23,7 +23,7 @@ public class Samples_WebPubSubServiceClient
         [Ignore("Only validating compilation of examples")]
         public void Example_CloseAllConnections()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = client.CloseAllConnections();
             Console.WriteLine(response.Status);
@@ -33,9 +33,12 @@ public void Example_CloseAllConnections()
         [Ignore("Only validating compilation of examples")]
         public void Example_CloseAllConnections_AllParameters()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = client.CloseAllConnections(new string[] { "<excluded>" }, "<reason>");
+            Response response = client.CloseAllConnections(excluded: new List<string>()
+{
+"<excluded>"
+}, reason: "<reason>");
             Console.WriteLine(response.Status);
         }
 
@@ -43,7 +46,7 @@ public void Example_CloseAllConnections_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CloseAllConnections_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = await client.CloseAllConnectionsAsync();
             Console.WriteLine(response.Status);
@@ -53,9 +56,12 @@ public async Task Example_CloseAllConnections_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CloseAllConnections_AllParameters_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = await client.CloseAllConnectionsAsync(new string[] { "<excluded>" }, "<reason>");
+            Response response = await client.CloseAllConnectionsAsync(excluded: new List<string>()
+{
+"<excluded>"
+}, reason: "<reason>");
             Console.WriteLine(response.Status);
         }
 
@@ -63,11 +69,10 @@ public async Task Example_CloseAllConnections_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_SendToAll()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            var data = File.OpenRead("<filePath>");
-
-            Response response = client.SendToAll(RequestContent.Create(data), ContentType.ApplicationOctetStream);
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = client.SendToAll(content, new ContentType("application/json"));
             Console.WriteLine(response.Status);
         }
 
@@ -75,11 +80,13 @@ public void Example_SendToAll()
         [Ignore("Only validating compilation of examples")]
         public void Example_SendToAll_AllParameters()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-            var data = File.OpenRead("<filePath>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = client.SendToAll(RequestContent.Create(data), ContentType.ApplicationOctetStream, new string[] { "<excluded>" }, "<filter>");
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = client.SendToAll(content, new ContentType("application/json"), excluded: new List<string>()
+{
+"<excluded>"
+}, filter: "<filter>");
             Console.WriteLine(response.Status);
         }
 
@@ -87,11 +94,10 @@ public void Example_SendToAll_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SendToAll_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-            var data = File.OpenRead("<filePath>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = await client.SendToAllAsync(RequestContent.Create(data), ContentType.ApplicationOctetStream);
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = await client.SendToAllAsync(content, new ContentType("application/json"));
             Console.WriteLine(response.Status);
         }
 
@@ -99,11 +105,13 @@ public async Task Example_SendToAll_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SendToAll_AllParameters_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-            var data = File.OpenRead("<filePath>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = await client.SendToAllAsync(RequestContent.Create(data), ContentType.ApplicationOctetStream, new string[] { "<excluded>" }, "<filter>");
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = await client.SendToAllAsync(content, new ContentType("application/json"), excluded: new List<string>()
+{
+"<excluded>"
+}, filter: "<filter>");
             Console.WriteLine(response.Status);
         }
 
@@ -111,7 +119,7 @@ public async Task Example_SendToAll_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CloseConnection()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = client.CloseConnection("<connectionId>");
             Console.WriteLine(response.Status);
@@ -121,9 +129,9 @@ public void Example_CloseConnection()
         [Ignore("Only validating compilation of examples")]
         public void Example_CloseConnection_AllParameters()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = client.CloseConnection("<connectionId>", "<reason>");
+            Response response = client.CloseConnection("<connectionId>", reason: "<reason>");
             Console.WriteLine(response.Status);
         }
 
@@ -131,7 +139,7 @@ public void Example_CloseConnection_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CloseConnection_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = await client.CloseConnectionAsync("<connectionId>");
             Console.WriteLine(response.Status);
@@ -141,9 +149,9 @@ public async Task Example_CloseConnection_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CloseConnection_AllParameters_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = await client.CloseConnectionAsync("<connectionId>", "<reason>");
+            Response response = await client.CloseConnectionAsync("<connectionId>", reason: "<reason>");
             Console.WriteLine(response.Status);
         }
 
@@ -151,11 +159,10 @@ public async Task Example_CloseConnection_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_SendToConnection()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-            var data = File.OpenRead("<filePath>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = client.SendToConnection("<connectionId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = client.SendToConnection("<connectionId>", content, new ContentType("application/json"));
             Console.WriteLine(response.Status);
         }
 
@@ -163,11 +170,10 @@ public void Example_SendToConnection()
         [Ignore("Only validating compilation of examples")]
         public void Example_SendToConnection_AllParameters()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-            var data = File.OpenRead("<filePath>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = client.SendToConnection("<connectionId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = client.SendToConnection("<connectionId>", content, new ContentType("application/json"));
             Console.WriteLine(response.Status);
         }
 
@@ -175,11 +181,10 @@ public void Example_SendToConnection_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SendToConnection_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            var data = File.OpenRead("<filePath>");
-
-            Response response = await client.SendToConnectionAsync("<connectionId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = await client.SendToConnectionAsync("<connectionId>", content, new ContentType("application/json"));
             Console.WriteLine(response.Status);
         }
 
@@ -187,11 +192,10 @@ public async Task Example_SendToConnection_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SendToConnection_AllParameters_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-            var data = File.OpenRead("<filePath>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = await client.SendToConnectionAsync("<connectionId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = await client.SendToConnectionAsync("<connectionId>", content, new ContentType("application/json"));
             Console.WriteLine(response.Status);
         }
 
@@ -199,7 +203,7 @@ public async Task Example_SendToConnection_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_RemoveConnectionFromAllGroups()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = client.RemoveConnectionFromAllGroups("<connectionId>");
             Console.WriteLine(response.Status);
@@ -209,7 +213,7 @@ public void Example_RemoveConnectionFromAllGroups()
         [Ignore("Only validating compilation of examples")]
         public void Example_RemoveConnectionFromAllGroups_AllParameters()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = client.RemoveConnectionFromAllGroups("<connectionId>");
             Console.WriteLine(response.Status);
@@ -219,7 +223,7 @@ public void Example_RemoveConnectionFromAllGroups_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RemoveConnectionFromAllGroups_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = await client.RemoveConnectionFromAllGroupsAsync("<connectionId>");
             Console.WriteLine(response.Status);
@@ -229,7 +233,7 @@ public async Task Example_RemoveConnectionFromAllGroups_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RemoveConnectionFromAllGroups_AllParameters_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = await client.RemoveConnectionFromAllGroupsAsync("<connectionId>");
             Console.WriteLine(response.Status);
@@ -239,7 +243,7 @@ public async Task Example_RemoveConnectionFromAllGroups_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CloseGroupConnections()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = client.CloseGroupConnections("<group>");
             Console.WriteLine(response.Status);
@@ -249,9 +253,12 @@ public void Example_CloseGroupConnections()
         [Ignore("Only validating compilation of examples")]
         public void Example_CloseGroupConnections_AllParameters()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = client.CloseGroupConnections("<group>", new string[] { "<excluded>" }, "<reason>");
+            Response response = client.CloseGroupConnections("<group>", excluded: new List<string>()
+{
+"<excluded>"
+}, reason: "<reason>");
             Console.WriteLine(response.Status);
         }
 
@@ -259,7 +266,7 @@ public void Example_CloseGroupConnections_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CloseGroupConnections_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = await client.CloseGroupConnectionsAsync("<group>");
             Console.WriteLine(response.Status);
@@ -269,9 +276,12 @@ public async Task Example_CloseGroupConnections_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CloseGroupConnections_AllParameters_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = await client.CloseGroupConnectionsAsync("<group>", new string[] { "<excluded>" }, "<reason>");
+            Response response = await client.CloseGroupConnectionsAsync("<group>", excluded: new List<string>()
+{
+"<excluded>"
+}, reason: "<reason>");
             Console.WriteLine(response.Status);
         }
 
@@ -279,11 +289,10 @@ public async Task Example_CloseGroupConnections_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_SendToGroup()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-            var data = File.OpenRead("<filePath>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = client.SendToGroup("<group>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = client.SendToGroup("<group>", content, new ContentType("application/json"));
             Console.WriteLine(response.Status);
         }
 
@@ -291,11 +300,13 @@ public void Example_SendToGroup()
         [Ignore("Only validating compilation of examples")]
         public void Example_SendToGroup_AllParameters()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            var data = File.OpenRead("<filePath>");
-
-            Response response = client.SendToGroup("<group>", RequestContent.Create(data), ContentType.ApplicationOctetStream, new string[] { "<excluded>" }, "<filter>");
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = client.SendToGroup("<group>", content, new ContentType("application/json"), excluded: new List<string>()
+{
+"<excluded>"
+}, filter: "<filter>");
             Console.WriteLine(response.Status);
         }
 
@@ -303,11 +314,10 @@ public void Example_SendToGroup_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SendToGroup_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            var data = File.OpenRead("<filePath>");
-
-            Response response = await client.SendToGroupAsync("<group>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = await client.SendToGroupAsync("<group>", content, new ContentType("application/json"));
             Console.WriteLine(response.Status);
         }
 
@@ -315,11 +325,13 @@ public async Task Example_SendToGroup_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SendToGroup_AllParameters_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-            var data = File.OpenRead("<filePath>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = await client.SendToGroupAsync("<group>", RequestContent.Create(data), ContentType.ApplicationOctetStream, new string[] { "<excluded>" }, "<filter>");
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = await client.SendToGroupAsync("<group>", content, new ContentType("application/json"), excluded: new List<string>()
+{
+"<excluded>"
+}, filter: "<filter>");
             Console.WriteLine(response.Status);
         }
 
@@ -327,7 +339,7 @@ public async Task Example_SendToGroup_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_RemoveConnectionFromGroup()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = client.RemoveConnectionFromGroup("<group>", "<connectionId>");
             Console.WriteLine(response.Status);
@@ -337,7 +349,7 @@ public void Example_RemoveConnectionFromGroup()
         [Ignore("Only validating compilation of examples")]
         public void Example_RemoveConnectionFromGroup_AllParameters()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = client.RemoveConnectionFromGroup("<group>", "<connectionId>");
             Console.WriteLine(response.Status);
@@ -347,7 +359,7 @@ public void Example_RemoveConnectionFromGroup_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RemoveConnectionFromGroup_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = await client.RemoveConnectionFromGroupAsync("<group>", "<connectionId>");
             Console.WriteLine(response.Status);
@@ -357,7 +369,7 @@ public async Task Example_RemoveConnectionFromGroup_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RemoveConnectionFromGroup_AllParameters_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = await client.RemoveConnectionFromGroupAsync("<group>", "<connectionId>");
             Console.WriteLine(response.Status);
@@ -367,7 +379,7 @@ public async Task Example_RemoveConnectionFromGroup_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddConnectionToGroup()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = client.AddConnectionToGroup("<group>", "<connectionId>");
             Console.WriteLine(response.Status);
@@ -377,7 +389,7 @@ public void Example_AddConnectionToGroup()
         [Ignore("Only validating compilation of examples")]
         public void Example_AddConnectionToGroup_AllParameters()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = client.AddConnectionToGroup("<group>", "<connectionId>");
             Console.WriteLine(response.Status);
@@ -387,7 +399,7 @@ public void Example_AddConnectionToGroup_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddConnectionToGroup_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = await client.AddConnectionToGroupAsync("<group>", "<connectionId>");
             Console.WriteLine(response.Status);
@@ -397,7 +409,7 @@ public async Task Example_AddConnectionToGroup_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_AddConnectionToGroup_AllParameters_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = await client.AddConnectionToGroupAsync("<group>", "<connectionId>");
             Console.WriteLine(response.Status);
@@ -407,7 +419,7 @@ public async Task Example_AddConnectionToGroup_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_CloseUserConnections()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = client.CloseUserConnections("<userId>");
             Console.WriteLine(response.Status);
@@ -417,9 +429,12 @@ public void Example_CloseUserConnections()
         [Ignore("Only validating compilation of examples")]
         public void Example_CloseUserConnections_AllParameters()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = client.CloseUserConnections("<userId>", new string[] { "<excluded>" }, "<reason>");
+            Response response = client.CloseUserConnections("<userId>", excluded: new List<string>()
+{
+"<excluded>"
+}, reason: "<reason>");
             Console.WriteLine(response.Status);
         }
 
@@ -427,7 +442,7 @@ public void Example_CloseUserConnections_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CloseUserConnections_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = await client.CloseUserConnectionsAsync("<userId>");
             Console.WriteLine(response.Status);
@@ -437,9 +452,12 @@ public async Task Example_CloseUserConnections_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_CloseUserConnections_AllParameters_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = await client.CloseUserConnectionsAsync("<userId>", new string[] { "<excluded>" }, "<reason>");
+            Response response = await client.CloseUserConnectionsAsync("<userId>", excluded: new List<string>()
+{
+"<excluded>"
+}, reason: "<reason>");
             Console.WriteLine(response.Status);
         }
 
@@ -447,11 +465,10 @@ public async Task Example_CloseUserConnections_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_SendToUser()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-            var data = File.OpenRead("<filePath>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = client.SendToUser("<userId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = client.SendToUser("<userId>", content, new ContentType("application/json"));
             Console.WriteLine(response.Status);
         }
 
@@ -459,11 +476,10 @@ public void Example_SendToUser()
         [Ignore("Only validating compilation of examples")]
         public void Example_SendToUser_AllParameters()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            var data = File.OpenRead("<filePath>");
-
-            Response response = client.SendToUser("<userId>", RequestContent.Create(data), ContentType.ApplicationOctetStream, "<filter>");
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = client.SendToUser("<userId>", content, new ContentType("application/json"), filter: "<filter>");
             Console.WriteLine(response.Status);
         }
 
@@ -471,11 +487,10 @@ public void Example_SendToUser_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SendToUser_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-            var data = File.OpenRead("<filePath>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = await client.SendToUserAsync("<userId>", RequestContent.Create(data), ContentType.ApplicationOctetStream);
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = await client.SendToUserAsync("<userId>", content, new ContentType("application/json"));
             Console.WriteLine(response.Status);
         }
 
@@ -483,11 +498,10 @@ public async Task Example_SendToUser_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_SendToUser_AllParameters_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
-
-            var data = File.OpenRead("<filePath>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
-            Response response = await client.SendToUserAsync("<userId>", RequestContent.Create(data), ContentType.ApplicationOctetStream, "<filter>");
+            RequestContent content = RequestContent.Create(File.OpenRead("<filePath>"));
+            Response response = await client.SendToUserAsync("<userId>", content, new ContentType("application/json"), filter: "<filter>");
             Console.WriteLine(response.Status);
         }
 
@@ -495,7 +509,7 @@ public async Task Example_SendToUser_AllParameters_Async()
         [Ignore("Only validating compilation of examples")]
         public void Example_RemoveUserFromAllGroups()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = client.RemoveUserFromAllGroups("<userId>");
             Console.WriteLine(response.Status);
@@ -505,7 +519,7 @@ public void Example_RemoveUserFromAllGroups()
         [Ignore("Only validating compilation of examples")]
         public void Example_RemoveUserFromAllGroups_AllParameters()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = client.RemoveUserFromAllGroups("<userId>");
             Console.WriteLine(response.Status);
@@ -515,7 +529,7 @@ public void Example_RemoveUserFromAllGroups_AllParameters()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RemoveUserFromAllGroups_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = await client.RemoveUserFromAllGroupsAsync("<userId>");
             Console.WriteLine(response.Status);
@@ -525,7 +539,7 @@ public async Task Example_RemoveUserFromAllGroups_Async()
         [Ignore("Only validating compilation of examples")]
         public async Task Example_RemoveUserFromAllGroups_AllParameters_Async()
         {
-            var client = new WebPubSubServiceClient("<https://my-service.azure.com>", "<hub>");
+            WebPubSubServiceClient client = new WebPubSubServiceClient("<Endpoint>", "<Hub>");
 
             Response response = await client.RemoveUserFromAllGroupsAsync("<userId>");
             Console.WriteLine(response.Status);